changeset 1262:d430337ea2ed

Merge.
author andrew
date Mon, 15 Jun 2009 16:26:26 +0100
parents dee80f291255
children 1a01c90431a7
files src/share/native/sun/java2d/cmm/lcms/LCMS.c
diffstat 1 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Mon Jun 15 14:59:45 2009 +0100
+++ b/src/share/native/sun/java2d/cmm/lcms/LCMS.c	Mon Jun 15 16:26:26 2009 +0100
@@ -687,17 +687,6 @@
 
     /* Shrink Icc, if needed.  */
     if (delta < 0) {
-<<<<<<< local
-	if (!Icc->Grow(Icc, delta)) {
-	    free(ptr);
-	    if(isNew) {
-		Icc->TagCount--;
-	    }
-	    J2dRlsTraceLn(J2D_TRACE_ERROR,
-			  "_cmsModifyTagData: Icc->Grow() == FALSE");
-	    return FALSE;
-	}
-=======
         if (!Icc->Grow(Icc, delta)) {
             free(ptr);
             if(isNew) {
@@ -707,7 +696,6 @@
                           "_cmsModifyTagData: Icc->Grow() == FALSE");
             return FALSE;
         }
->>>>>>> other
     }
 
     /* Adjust tag offsets: if the tag is new, we must account