From 4087f72f44898798925877a97aaf65e2dd26abe8 Mon Sep 17 00:00:00 2001
From: jgodinez <unknown>
Date: Fri, 30 Aug 2013 09:10:30 -0700
Subject: [PATCH] 8017469: [macosx] Printing problem using ja and zh_CN locales
 Reviewed-by: prr, jchen

---
 src/macosx/native/sun/awt/CTextPipe.m | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/macosx/native/sun/awt/CTextPipe.m b/src/macosx/native/sun/awt/CTextPipe.m
index d9bf48afd..f6510f204 100644
--- a/src/macosx/native/sun/awt/CTextPipe.m
+++ b/src/macosx/native/sun/awt/CTextPipe.m
@@ -145,11 +145,6 @@ void JavaCT_DrawGlyphVector
 
     BOOL saved = false;
 
-    /* Save and restore of graphics context is done before the iteration.  
-       This seems to work using our test case (see bug ID 7158350) so we are restoring it at
-       the end of the for loop.  If we find out that save/restore outside the loop
-       doesn't work on all cases then we will move the Save/Restore inside the loop.*/
-    CGContextSaveGState(cgRef);
     CGAffineTransform invTx = CGAffineTransformInvert(strike->fTx);
 
     NSUInteger i;
@@ -226,7 +221,9 @@ void JavaCT_DrawGlyphVector
 
     }
     // reset the font on the context after striking a unicode with CoreText
-    CGContextRestoreGState(cgRef);
+    if (saved) {
+        CGContextRestoreGState(cgRef);
+    }
 }
 
 // Using the Quartz Surface Data context, draw a hot-substituted character run
-- 
GitLab