]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 507c0fd)
Cleanup...
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Sat, 9 Apr 2011 05:01:58 +0000 (05:01 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Sat, 9 Apr 2011 05:01:58 +0000 (05:01 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9674 7a7537e8-13f0-0310-91df-b6672ffda945

filter/raster.c patch | blob | blame | history
xcode/CUPS.xcodeproj/project.pbxproj patch | blob | blame | history

diff --git a/filter/raster.c b/filter/raster.c
index 844959333688ec2e3a0437cf064f9e9b3f195e93..2224968904359868888585873cf4fa3816093b1a 100644 (file)
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1043,7 +1043,6 @@ cups_raster_read(cups_raster_t *r,        /* I - Raster stream */
 
       unsigned char    *bufptr;        /* Temporary buffer pointer */
 
-
       remaining -= count;
 
       for (bufptr = r->bufptr; count > 0; count --, total ++)
@@ -1241,7 +1240,7 @@ cups_raster_write(
   *wptr++ = r->count - 1;
 
  /*
-  * Write using a modified TIFF "packbits" compression...
+  * Write using a modified PackBits compression...
   */
 
   for (ptr = pixels; ptr < pend;)
diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj
index 724dffabae7df9214f4b0fd8674b77f2cb976a12..07f865b421d1c0db54273cef653170ef0569d010 100644 (file)
--- a/xcode/CUPS.xcodeproj/project.pbxproj
+++ b/xcode/CUPS.xcodeproj/project.pbxproj
@@ -3225,7 +3225,6 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3243,7 +3242,6 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3279,7 +3277,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3299,7 +3296,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3336,7 +3332,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3358,7 +3353,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PUBLIC_HEADERS_FOLDER_PATH = /usr/include/cups;
@@ -3382,7 +3376,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3401,7 +3394,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3423,7 +3415,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3442,7 +3433,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3464,7 +3454,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3483,7 +3472,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3505,7 +3493,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3524,7 +3511,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/libexec/cups/daemon;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3546,7 +3532,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3565,7 +3550,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3589,7 +3573,6 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = libcups_static;
@@ -3614,7 +3597,6 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/local/lib;
                                MACH_O_TYPE = staticlib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = libcups_static;
                                PUBLIC_HEADERS_FOLDER_PATH = /usr/include/cups;
@@ -3639,7 +3621,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3658,7 +3639,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3680,7 +3660,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3699,7 +3678,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3721,7 +3699,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3740,7 +3717,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3762,7 +3738,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3781,7 +3756,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3803,7 +3777,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3822,7 +3795,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3844,7 +3816,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3863,7 +3834,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3885,7 +3855,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3904,7 +3873,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/bin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3926,7 +3894,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -3945,7 +3912,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/sbin;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -3968,7 +3934,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                ONLY_ACTIVE_ARCH = YES;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3991,7 +3956,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                INSTALL_PATH = /usr/lib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
                                PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/cups;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PUBLIC_HEADERS_FOLDER_PATH = /usr/include/cups;
@@ -4014,7 +3978,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
+                               INSTALL_PATH = /usr/sbin;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -4033,7 +3997,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
+                               INSTALL_PATH = /usr/sbin;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -4055,7 +4019,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
+                               INSTALL_PATH = /usr/lib;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -4075,7 +4039,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.6;
+                               INSTALL_PATH = /usr/lib;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -4254,6 +4218,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_PATH = /usr/libexec/cups/backend;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "\"$(SRCROOT)/../backend\"",
@@ -4275,6 +4240,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_PATH = /usr/libexec/cups/backend;
                                LIBRARY_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "\"$(SRCROOT)/../backend\"",
@@ -4299,7 +4265,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.7;
+                               INSTALL_PATH = /usr/libexec/cups/filter;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -4317,7 +4283,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
-                               MACOSX_DEPLOYMENT_TARGET = 10.7;
+                               INSTALL_PATH = /usr/libexec/cups/filter;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -4330,6 +4296,7 @@
                                        .,
                                        ..,
                                );
+                               MACOSX_DEPLOYMENT_TARGET = "";
                                OTHER_CFLAGS = (
                                        "-D_CUPS_SOURCE",
                                        "-Wno-shorten-64-to-32",
@@ -4346,6 +4313,7 @@
                                        .,
                                        ..,
                                );
+                               MACOSX_DEPLOYMENT_TARGET = "";
                                OTHER_CFLAGS = (
                                        "-D_CUPS_SOURCE",
                                        "-Wno-shorten-64-to-32",
@@ -4370,6 +4338,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_PATH = /usr/bin;
                                ONLY_ACTIVE_ARCH = YES;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
@@ -4387,6 +4356,7 @@
                                GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_PATH = /usr/bin;
                                PRODUCT_NAME = "$(TARGET_NAME)";
                        };
                        name = Release;
@@ -4685,6 +4655,7 @@
                                7258EAEB134594C4009286F1 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Release;
                };
                72BF963A1333042100B1EAD7 /* Build configuration list for PBXProject "CUPS" */ = {
                        isa = XCConfigurationList;
Mirror of https://github.com/OpenPrinting/cups.git