Author: fredkiefer
Date: Sun Jun 19 22:24:26 2016
New Revision: 39882
URL: http://svn.gna.org/viewcvs/gnustep?rev=39882&view=rev
Log:
Make this a library with resources.
Modified:
libs/opal/trunk/ChangeLog
libs/opal/trunk/Source/ (props changed)
libs/opal/trunk/Source/GNUmakefile
libs/opal/trunk/Source/OpalGraphics/OPColorSpaceLCMS.m
Modified: libs/opal/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/opal/trunk/ChangeLog?rev=39882&r1=39881&r2=39882&view=diff
==============================================================================
--- libs/opal/trunk/ChangeLog (original)
+++ libs/opal/trunk/ChangeLog Sun Jun 19 22:24:26 2016
@@ -1,3 +1,10 @@
+2016-06-19 Fred Kiefer <[email protected]>
+
+ * Source/GNUmakefile
+ Make this a library with resources.
+ * Source/OpalGraphics/OPColorSpaceLCMS.m
+ Load colour profile via library bundle.
+
2016-06-19 Fred Kiefer <[email protected]>
* Source/OpalGraphics/CGImage-private.h
Propchange: libs/opal/trunk/Source/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jun 19 22:24:26 2016
@@ -1 +1,2 @@
obj
+opal
Modified: libs/opal/trunk/Source/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/opal/trunk/Source/GNUmakefile?rev=39882&r1=39881&r2=39882&view=diff
==============================================================================
--- libs/opal/trunk/Source/GNUmakefile (original)
+++ libs/opal/trunk/Source/GNUmakefile Sun Jun 19 22:24:26 2016
@@ -32,6 +32,9 @@
LIBRARIES_DEPEND_UPON += $(shell pkg-config --libs libpng)
LIBRARIES_DEPEND_UPON += -ljpeg -ltiff
+libopal_HAS_RESOURCE_BUNDLE = yes
+libopal_RESOURCE_FILES = ../Resources/coated_FOGRA39L_argl.icc
+
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/aggregate.make
include $(GNUSTEP_MAKEFILES)/library.make
Modified: libs/opal/trunk/Source/OpalGraphics/OPColorSpaceLCMS.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/opal/trunk/Source/OpalGraphics/OPColorSpaceLCMS.m?rev=39882&r1=39881&r2=39882&view=diff
==============================================================================
--- libs/opal/trunk/Source/OpalGraphics/OPColorSpaceLCMS.m (original)
+++ libs/opal/trunk/Source/OpalGraphics/OPColorSpaceLCMS.m Sun Jun 19
22:24:26 2016
@@ -74,10 +74,15 @@
{
if (nil == colorSpaceGenericCMYK)
{
- NSString *path = [[NSBundle bundleForClass: [self class]]
+ NSString *path = [[NSBundle bundleForLibrary: @"opal"]
pathForResource: @"coated_FOGRA39L_argl"
ofType: @"icc"];
NSData *data = [NSData dataWithContentsOfFile: path];
+ if (data == nil)
+ {
+ NSLog(@"Failed to load colour profile from file %@", path);
+ return nil;
+ }
colorSpaceGenericCMYK = [[OPColorSpaceLCMS alloc] initWithICCProfile:
data];
}
return colorSpaceGenericCMYK;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
