Changeset 2897 for libpipiTweet

Timestamp:

Oct 7, 2008, 8:10:14 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added preliminary support of CoreImage? (Cocoa/Mac? OS X) Changed default hidden unicode glyph to 'x' in The Pimp to fix a compilation problem

Location:

libpipi/trunk

Files:

• ThePimp/gtk-gui/ThePimp.NewFile.cs (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• pipi/Makefile.am (modified) (1 diff)
• pipi/codec.c (modified) (1 diff)
• pipi/codec/coreimage.h (added)
• pipi/codec/coreimage.m (added)
• pipi/pipi_internals.h (modified) (1 diff)

libpipi/trunk/ThePimp/gtk-gui/ThePimp.NewFile.cs

@@ -76 +76 @@
             this.entry1.IsEditable = true;
             this.entry1.WidthChars = 6;
-            this.entry1.InvisibleChar = '●';
+            this.entry1.InvisibleChar = 'x';
             this.entry1.Xalign = 1F;
             this.table1.Add(this.entry1);
@@ -91 +91 @@
             this.entry2.IsEditable = true;
             this.entry2.WidthChars = 6;
-            this.entry2.InvisibleChar = '●';
+            this.entry2.InvisibleChar = 'x';
             this.entry2.Xalign = 1F;
             this.table1.Add(this.entry2);

libpipi/trunk/configure.ac

@@ -137 +137 @@
 [
  MACOSX_SDK_FRAMEWORKS="-F${MACOSX_SDK}/System/Library/Frameworks"
- CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
- CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS} -I/Developer//SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QuartzCore.framework/Versions/A/Headers/"
+ CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS} -I/Developer//SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QuartzCore.framework/Versions/A/Headers/"
  CXXFLAGS="${CXXFLAGS} ${MACOSX_SDK_CXXFLAGS}"
  OBJCFLAGS="${OBJCFLAGS} ${MACOSX_SDK_CFLAGS}"

libpipi/trunk/pipi/Makefile.am

@@ -111 +111 @@
 endif
 
+if USE_COCOA
+codec_objcflags = -I"/Developer//SDKs/MacOSX10.5.sdk/System/Library/Frameworks/QuartzCore.framework/Versions/A/Headers/"
+codec_libs += -framework Cocoa -framework IOKit -framework CoreFoundation -framework QuartzCore
+codec_sources += codec/coreimage.m
+endif

libpipi/trunk/pipi/codec.c

@@ -56 +56 @@
         ret = pipi_load_gdi(name);
 #endif
-
+#if USE_COCOA
+    if(!ret)
+        ret = pipi_load_coreimage(name);
+#endif
     return ret;
 }

libpipi/trunk/pipi/pipi_internals.h

@@ -86 +86 @@
 #endif
 
+#ifdef USE_COCOA
+pipi_image_t *pipi_load_coreimage(const char *name);
+int pipi_save_coreimage(pipi_image_t *img, const char *name);
+#endif
+
+
 pipi_image_t *pipi_load_oric(const char *name);
 int pipi_save_oric(pipi_image_t *img, const char *name);