* Fixed Mac OSX compilation and Xcode project file

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@4081 92316355-f0b4-4df1-b90c-862c8a59935f

pipi/codec/coreimage.m

@@ -20,8 +20,6 @@
 #import "coreimage.h"
 
 #ifdef USE_COCOA
-#import <CIImage.h>
-
 
 static int pipi_free_coreimage(pipi_image_t *img);
 

xcode/xcode.xcodeproj/jylam.pbxuser

@@ -1,378 +0,0 @@
-// !$*UTF8*$!
-{
-	08FB7793FE84155DC02AAC07 /* Project object */ = {
-		activeBuildConfigurationName = Debug;
-		activeTarget = D28A88AD04BDD90700651E21 /* xcode */;
-		addToTargets = (
-			D28A88AD04BDD90700651E21 /* xcode */,
-		);
-		codeSenseManager = E6353FE70EAB3DD3005731B2 /* Code sense */;
-		perUserDictionary = {
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					964,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					924,
-					60,
-					20,
-					48,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 246105013;
-			PBXWorkspaceStateSaveDate = 246105013;
-		};
-		perUserProjectItems = {
-			E61B9EAB0EAB423300AE69EA = E61B9EAB0EAB423300AE69EA /* PBXTextBookmark */;
-			E61B9EAC0EAB423300AE69EA = E61B9EAC0EAB423300AE69EA /* PBXTextBookmark */;
-			E61B9EAD0EAB423300AE69EA = E61B9EAD0EAB423300AE69EA /* PBXTextBookmark */;
-			E6353FFC0EAB3E7F005731B2 = E6353FFC0EAB3E7F005731B2 /* PBXTextBookmark */;
-			E6353FFD0EAB3E7F005731B2 = E6353FFD0EAB3E7F005731B2 /* PBXTextBookmark */;
-			E6353FFF0EAB3E7F005731B2 = E6353FFF0EAB3E7F005731B2 /* PBXTextBookmark */;
-			E63540000EAB3E7F005731B2 = E63540000EAB3E7F005731B2 /* PBXTextBookmark */;
-			E635403D0EAB4157005731B2 = E635403D0EAB4157005731B2 /* PBXTextBookmark */;
-			E635403E0EAB4157005731B2 = E635403E0EAB4157005731B2 /* PBXTextBookmark */;
-			E63540400EAB4157005731B2 = E63540400EAB4157005731B2 /* PBXTextBookmark */;
-			E63540410EAB4157005731B2 = E63540410EAB4157005731B2 /* PBXTextBookmark */;
-			E63540450EAB4157005731B2 = E63540450EAB4157005731B2 /* PBXTextBookmark */;
-			E63540460EAB4157005731B2 = E63540460EAB4157005731B2 /* PBXTextBookmark */;
-			E63540470EAB4157005731B2 = E63540470EAB4157005731B2 /* PBXTextBookmark */;
-			E635404D0EAB4157005731B2 = E635404D0EAB4157005731B2 /* PBXTextBookmark */;
-		};
-		sourceControlManager = E6353FE60EAB3DD3005731B2 /* Source Control */;
-		userBuildSettings = {
-		};
-	};
-	D28A88AD04BDD90700651E21 /* xcode */ = {
-		activeExec = 0;
-	};
-	E61B9EAB0EAB423300AE69EA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540500EAB4157005731B2 /* Makefile.am */;
-		name = "Makefile.am: 8";
-		rLen = 0;
-		rLoc = 170;
-		rType = 0;
-		vrLen = 184;
-		vrLoc = 0;
-	};
-	E61B9EAC0EAB423300AE69EA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540500EAB4157005731B2 /* Makefile.am */;
-		name = "Makefile.am: 8";
-		rLen = 0;
-		rLoc = 170;
-		rType = 0;
-		vrLen = 184;
-		vrLoc = 0;
-	};
-	E61B9EAD0EAB423300AE69EA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E61B9EAE0EAB423300AE69EA /* Makefile.am */;
-		name = "Makefile.am: 12";
-		rLen = 0;
-		rLoc = 465;
-		rType = 0;
-		vrLen = 766;
-		vrLoc = 0;
-	};
-	E61B9EAE0EAB423300AE69EA /* Makefile.am */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = Makefile.am;
-		path = "/Users/jylam/Desktop/code/libcaca-trunk/examples/Makefile.am";
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1152, 1120}}";
-			sepNavSelRange = "{465, 0}";
-			sepNavVisRange = "{0, 1193}";
-		};
-	};
-	E61B9EBA0EAB665300AE69EA /* libpipi */ = {
-		activeExec = 0;
-	};
-	E6353FE60EAB3DD3005731B2 /* Source Control */ = {
-		isa = PBXSourceControlManager;
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		scmConfiguration = {
-		};
-	};
-	E6353FE70EAB3DD3005731B2 /* Code sense */ = {
-		isa = PBXCodeSenseManager;
-		indexTemplatePath = "";
-	};
-	E6353FEA0EAB3E35005731B2 /* accessors.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 910}}";
-			sepNavSelRange = "{569, 0}";
-			sepNavVisRange = "{0, 1084}";
-		};
-	};
-	E6353FEB0EAB3E35005731B2 /* codec.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 1498}}";
-			sepNavSelRange = "{566, 0}";
-			sepNavVisRange = "{1197, 857}";
-		};
-	};
-	E6353FF00EAB3E35005731B2 /* pipi.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1409, 1358}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1237}";
-			sepNavWindowFrame = "{{95, 24}, {1468, 978}}";
-		};
-	};
-	E6353FF30EAB3E35005731B2 /* stock.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 2954}}";
-			sepNavSelRange = "{269, 0}";
-			sepNavVisRange = "{0, 1123}";
-		};
-	};
-	E6353FF50EAB3E68005731B2 /* oric.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {612, 8190}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 781}";
-		};
-	};
-	E6353FF60EAB3E68005731B2 /* gdi.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 2128}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{379, 1086}";
-		};
-	};
-	E6353FF70EAB3E68005731B2 /* sdl.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 1876}}";
-			sepNavSelRange = "{2580, 15}";
-			sepNavVisRange = "{1979, 1199}";
-		};
-	};
-	E6353FF90EAB3E68005731B2 /* imlib.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 1722}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1100}";
-		};
-	};
-	E6353FFA0EAB3E68005731B2 /* coreimage.m */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 2352}}";
-			sepNavSelRange = "{2500, 0}";
-			sepNavVisRange = "{1896, 1411}";
-		};
-	};
-	E6353FFC0EAB3E7F005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FF50EAB3E68005731B2 /* oric.c */;
-		name = "oric.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 781;
-		vrLoc = 0;
-	};
-	E6353FFD0EAB3E7F005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FF60EAB3E68005731B2 /* gdi.c */;
-		name = "gdi.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 711;
-		vrLoc = 0;
-	};
-	E6353FFF0EAB3E7F005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FF50EAB3E68005731B2 /* oric.c */;
-		name = "oric.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 781;
-		vrLoc = 0;
-	};
-	E63540000EAB3E7F005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FF60EAB3E68005731B2 /* gdi.c */;
-		name = "gdi.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 711;
-		vrLoc = 0;
-	};
-	E63540270EAB3EDC005731B2 /* coreimage.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 659}}";
-			sepNavSelRange = "{643, 0}";
-			sepNavVisRange = "{0, 867}";
-		};
-	};
-	E635402B0EAB3EF2005731B2 /* pipi_internals.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1142, 1414}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{1469, 1195}";
-		};
-	};
-	E63540380EAB3F77005731B2 /* configure.ac */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1488, 2912}}";
-			sepNavSelRange = "{5673, 0}";
-			sepNavVisRange = "{5025, 1176}";
-		};
-	};
-	E635403D0EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FFA0EAB3E68005731B2 /* coreimage.m */;
-		name = "coreimage.m: 4";
-		rLen = 0;
-		rLoc = 129;
-		rType = 0;
-		vrLen = 740;
-		vrLoc = 0;
-	};
-	E635403E0EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E635403F0EAB4157005731B2 /* configure.ac */;
-		name = "configure.ac: 324";
-		rLen = 20;
-		rLoc = 11870;
-		rType = 0;
-		vrLen = 758;
-		vrLoc = 11438;
-	};
-	E635403F0EAB4157005731B2 /* configure.ac */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = configure.ac;
-		path = "/Users/jylam/Desktop/code/libcaca-trunk/configure.ac";
-		sourceTree = "<absolute>";
-	};
-	E63540400EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540380EAB3F77005731B2 /* configure.ac */;
-		name = "configure.ac: 174";
-		rLen = 0;
-		rLoc = 5673;
-		rType = 0;
-		vrLen = 1176;
-		vrLoc = 5025;
-	};
-	E63540410EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540420EAB4157005731B2 /* Makefile.am */;
-		name = "Makefile.am: 19";
-		rLen = 27;
-		rLoc = 582;
-		rType = 0;
-		vrLen = 766;
-		vrLoc = 0;
-	};
-	E63540420EAB4157005731B2 /* Makefile.am */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = Makefile.am;
-		path = "/Users/jylam/Desktop/code/libcaca-trunk/examples/Makefile.am";
-		sourceTree = "<absolute>";
-	};
-	E63540450EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E6353FFA0EAB3E68005731B2 /* coreimage.m */;
-		name = "coreimage.m: 4";
-		rLen = 0;
-		rLoc = 129;
-		rType = 0;
-		vrLen = 740;
-		vrLoc = 0;
-	};
-	E63540460EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540380EAB3F77005731B2 /* configure.ac */;
-		name = "configure.ac: 7";
-		rLen = 0;
-		rLoc = 124;
-		rType = 0;
-		vrLen = 897;
-		vrLoc = 359;
-	};
-	E63540470EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E63540480EAB4157005731B2 /* configure.ac */;
-		name = "configure.ac: 130";
-		rLen = 4;
-		rLoc = 4237;
-		rType = 0;
-		vrLen = 974;
-		vrLoc = 3733;
-	};
-	E63540480EAB4157005731B2 /* configure.ac */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = configure.ac;
-		path = "/Users/jylam/Desktop/code/libcaca-trunk/configure.ac";
-		sourceTree = "<absolute>";
-	};
-	E635404D0EAB4157005731B2 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = E635404E0EAB4157005731B2 /* Makefile.am */;
-		name = "Makefile.am: 19";
-		rLen = 27;
-		rLoc = 582;
-		rType = 0;
-		vrLen = 766;
-		vrLoc = 0;
-	};
-	E635404E0EAB4157005731B2 /* Makefile.am */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = Makefile.am;
-		path = "/Users/jylam/Desktop/code/libcaca-trunk/examples/Makefile.am";
-		sourceTree = "<absolute>";
-	};
-	E63540500EAB4157005731B2 /* Makefile.am */ = {
-		isa = PBXFileReference;
-		lastKnownFileType = text;
-		name = Makefile.am;
-		path = "/Users/jylam/libpipi-trunk/src/Makefile.am";
-		sourceTree = "<absolute>";
-	};
-}

xcode/xcode.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		E6353FEC0EAB3E35005731B2 /* colorstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = colorstring.c; path = ../pipi/colorstring.c; sourceTree = SOURCE_ROOT; };
 		E6353FED0EAB3E35005731B2 /* context.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = context.c; path = ../pipi/context.c; sourceTree = SOURCE_ROOT; };
 		E6353FEE0EAB3E35005731B2 /* dither.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dither.c; path = ../pipi/dither.c; sourceTree = SOURCE_ROOT; };
-		E6353FEF0EAB3E35005731B2 /* measure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = measure.c; path = ../pipi/measure.c; sourceTree = SOURCE_ROOT; };
 		E6353FF00EAB3E35005731B2 /* pipi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pipi.c; path = ../pipi/pipi.c; sourceTree = SOURCE_ROOT; };
 		E6353FF10EAB3E35005731B2 /* pixels.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pixels.c; path = ../pipi/pixels.c; sourceTree = SOURCE_ROOT; };
 		E6353FF20EAB3E35005731B2 /* resize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resize.c; path = ../pipi/resize.c; sourceTree = SOURCE_ROOT; };
@@ -25,7 +24,6 @@
 		E6353FFA0EAB3E68005731B2 /* coreimage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = coreimage.m; path = ../pipi/codec/coreimage.m; sourceTree = SOURCE_ROOT; };
 		E63540040EAB3E95005731B2 /* noise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = noise.c; sourceTree = "<group>"; };
 		E63540050EAB3E95005731B2 /* screen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = screen.c; sourceTree = "<group>"; };
-		E63540070EAB3E9D005731B2 /* histogram.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = histogram.c; sourceTree = "<group>"; };
 		E63540090EAB3E9D005731B2 /* autocontrast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = autocontrast.c; sourceTree = "<group>"; };
 		E635400A0EAB3E9D005731B2 /* blur.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = blur.c; sourceTree = "<group>"; };
 		E635400B0EAB3E9D005731B2 /* color.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = color.c; sourceTree = "<group>"; };
@@ -43,7 +41,6 @@
 		E635401A0EAB3E9D005731B2 /* floodfill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = floodfill.c; sourceTree = "<group>"; };
 		E635401B0EAB3E9D005731B2 /* line.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = line.c; sourceTree = "<group>"; };
 		E635401C0EAB3E9D005731B2 /* tile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tile.c; sourceTree = "<group>"; };
-		E635401E0EAB3E9D005731B2 /* mean.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mean.c; sourceTree = "<group>"; };
 		E635401F0EAB3E9D005731B2 /* minmax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minmax.c; sourceTree = "<group>"; };
 		E63540200EAB3E9D005731B2 /* mulscreen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mulscreen.c; sourceTree = "<group>"; };
 		E63540210EAB3E9D005731B2 /* rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rgb.c; sourceTree = "<group>"; };
@@ -71,7 +68,6 @@
 		E6353FE90EAB3DF4005731B2 /* libpipi */ = {
 			isa = PBXGroup;
 			children = (
-				E63540060EAB3E9D005731B2 /* histogram */,
 				E63540080EAB3E9D005731B2 /* filter */,
 				E63540100EAB3E9D005731B2 /* dither */,
 				E63540160EAB3E9D005731B2 /* quantize */,
@@ -84,7 +80,6 @@
 				E6353FEC0EAB3E35005731B2 /* colorstring.c */,
 				E6353FED0EAB3E35005731B2 /* context.c */,
 				E6353FEE0EAB3E35005731B2 /* dither.c */,
-				E6353FEF0EAB3E35005731B2 /* measure.c */,
 				E6353FF00EAB3E35005731B2 /* pipi.c */,
 				E6353FF10EAB3E35005731B2 /* pixels.c */,
 				E6353FF20EAB3E35005731B2 /* resize.c */,
@@ -116,15 +111,6 @@
 			path = ../pipi/render;
 			sourceTree = SOURCE_ROOT;
 		};
-		E63540060EAB3E9D005731B2 /* histogram */ = {
-			isa = PBXGroup;
-			children = (
-				E63540070EAB3E9D005731B2 /* histogram.c */,
-			);
-			name = histogram;
-			path = ../pipi/histogram;
-			sourceTree = SOURCE_ROOT;
-		};
 		E63540080EAB3E9D005731B2 /* filter */ = {
 			isa = PBXGroup;
 			children = (
@@ -177,7 +163,6 @@
 		E635401D0EAB3E9D005731B2 /* combine */ = {
 			isa = PBXGroup;
 			children = (
-				E635401E0EAB3E9D005731B2 /* mean.c */,
 				E635401F0EAB3E9D005731B2 /* minmax.c */,
 				E63540200EAB3E9D005731B2 /* mulscreen.c */,
 				E63540210EAB3E9D005731B2 /* rgb.c */,