Browse Source

* Added compilation to xcode project (using main Makefile)

* Fixed a leak in CoreImage image release function 


git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3038 92316355-f0b4-4df1-b90c-862c8a59935f
remotes/tiles
jylam 16 years ago
parent
commit
fd023dae55
3 changed files with 127 additions and 6 deletions
  1. +2
    -0
      pipi/codec/coreimage.m
  2. +80
    -6
      xcode/xcode.xcodeproj/jylam.pbxuser
  3. +45
    -0
      xcode/xcode.xcodeproj/project.pbxproj

+ 2
- 0
pipi/codec/coreimage.m View File

@@ -159,6 +159,8 @@ int pipi_save_coreimage(pipi_image_t *img, const char *name)

static int pipi_free_coreimage(pipi_image_t *img)
{
if(img->codec_priv)
free(img->codec_priv);
return 0;
}



+ 80
- 6
xcode/xcode.xcodeproj/jylam.pbxuser View File

@@ -13,7 +13,7 @@
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
884,
964,
20,
48,
43,
@@ -30,6 +30,28 @@
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;
};
@@ -99,6 +121,9 @@
sepNavVisRange = "{0, 1193}";
};
};
E61B9EBA0EAB665300AE69EA /* libpipi */ = {
activeExec = 0;
};
E6353FE60EAB3DD3005731B2 /* Source Control */ = {
isa = PBXSourceControlManager;
fallbackIsa = XCSourceControlManager;
@@ -110,6 +135,20 @@
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}}";
@@ -118,6 +157,13 @@
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}}";
@@ -127,16 +173,30 @@
};
E6353FF60EAB3E68005731B2 /* gdi.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {612, 2114}}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 2128}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 711}";
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}, {1062, 1358}}";
sepNavSelRange = "{129, 0}";
sepNavVisRange = "{0, 740}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 2352}}";
sepNavSelRange = "{2500, 0}";
sepNavVisRange = "{1896, 1411}";
};
};
E6353FFC0EAB3E7F005731B2 /* PBXTextBookmark */ = {
@@ -179,6 +239,20 @@
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}}";


+ 45
- 0
xcode/xcode.xcodeproj/project.pbxproj View File

@@ -232,6 +232,20 @@
passBuildSettingsInEnvironment = 1;
productName = xcode;
};
E61B9EBA0EAB665300AE69EA /* libpipi */ = {
isa = PBXLegacyTarget;
buildArgumentsString = "$(ACTION)";
buildConfigurationList = E61B9EC10EAB669D00AE69EA /* Build configuration list for PBXLegacyTarget "libpipi" */;
buildPhases = (
);
buildToolPath = /usr/bin/make;
buildWorkingDirectory = "/Users/jylam/libpipi-trunk";
dependencies = (
);
name = libpipi;
passBuildSettingsInEnvironment = 1;
productName = libpipi;
};
/* End PBXLegacyTarget section */

/* Begin PBXProject section */
@@ -245,6 +259,7 @@
projectRoot = "";
targets = (
D28A88AD04BDD90700651E21 /* xcode */,
E61B9EBA0EAB665300AE69EA /* libpipi */,
);
};
/* End PBXProject section */
@@ -299,6 +314,27 @@
};
name = Release;
};
E61B9EBB0EAB665300AE69EA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = libpipi;
};
name = Debug;
};
E61B9EBC0EAB665300AE69EA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = libpipi;
ZERO_LINK = NO;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
@@ -320,6 +356,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E61B9EC10EAB669D00AE69EA /* Build configuration list for PBXLegacyTarget "libpipi" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E61B9EBB0EAB665300AE69EA /* Debug */,
E61B9EBC0EAB665300AE69EA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;


Loading…
Cancel
Save