diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-06 18:40:48 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-06-06 18:40:48 +0400 |
| commit | a23a1534a33b7f59c69ec201e501754b14654d9e (patch) | |
| tree | 002b61ef4478463cbedfb816ea75381b3ac4b6e3 /src/thirdparty/lcms2 | |
| parent | f524befc185cd421399607a7856a92f626c6f5b7 (diff) | |
update lcms2 and Changelog
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3187 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/thirdparty/lcms2')
| -rw-r--r-- | src/thirdparty/lcms2/AUTHORS | 1 | ||||
| -rw-r--r-- | src/thirdparty/lcms2/ChangeLog | 1 | ||||
| -rw-r--r-- | src/thirdparty/lcms2/src/cmsio0.c | 11 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/thirdparty/lcms2/AUTHORS b/src/thirdparty/lcms2/AUTHORS index 6255bb963..0536dbfb8 100644 --- a/src/thirdparty/lcms2/AUTHORS +++ b/src/thirdparty/lcms2/AUTHORS @@ -16,6 +16,7 @@ Chris Evans Lorenzo Ridolfi
Robin Watts
Shawn Pedersen
+Andrew Brygin
Special Thanks
--------------
diff --git a/src/thirdparty/lcms2/ChangeLog b/src/thirdparty/lcms2/ChangeLog index b91bbe8f3..86fbafdd9 100644 --- a/src/thirdparty/lcms2/ChangeLog +++ b/src/thirdparty/lcms2/ChangeLog @@ -39,6 +39,7 @@ Fixed a bug that made crash black preservation on CMYK2CMYK devicelinks Added named color functionality
Fixed a bug in black preservation and sligtly non-monotonic curves
Added dictionary metatag support
+Fixed a bug on ReadRAWtag
2.2 Maintenance release
diff --git a/src/thirdparty/lcms2/src/cmsio0.c b/src/thirdparty/lcms2/src/cmsio0.c index f8af717b8..2080c96d7 100644 --- a/src/thirdparty/lcms2/src/cmsio0.c +++ b/src/thirdparty/lcms2/src/cmsio0.c @@ -1460,7 +1460,10 @@ cmsBool CMSEXPORT cmsWriteTag(cmsHPROFILE hProfile, cmsTagSignature sig, const v if (data == NULL) {
- cmsSignalError(cmsGetProfileContextID(hProfile), cmsERROR_NULL, "couldn't wite NULL to tag");
+ i = _cmsSearchTag(Icc, sig, FALSE);
+ if (i >= 0)
+ Icc ->TagNames[i] = (cmsTagSignature) 0;
+ // Unsupported by now, reserved for future ampliations (delete)
return FALSE;
}
@@ -1656,6 +1659,12 @@ cmsInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSignature sig // Serialize
TypeHandler ->ContextID = Icc ->ContextID;
TypeHandler ->ICCVersion = Icc ->Version;
+
+ if (!_cmsWriteTypeBase(MemIO, TypeHandler ->Signature)) {
+ cmsCloseIOhandler(MemIO);
+ return 0;
+ }
+
if (!TypeHandler ->WritePtr(TypeHandler, MemIO, Object, TagDescriptor ->ElemCount)) {
cmsCloseIOhandler(MemIO);
return 0;
|