commit e6902af4d6204323fefaea49556aa802cbeb9187
author Glade Diviney <mopriadevteam@gmail.com> Mon Jun 12 18:32:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 12 18:32:46 2017 +0000
tree eb7352e4b07ca4ce285e31ca2194dc3f9fe06f60
parent 29b50e168dadd6354cd124e20343a6203f378015
parent f6975e3532ff6e0235113dce16e68c1456efd2c2

Merge "fix two-sided multiple-copy jobs" am: 86fdf4a745
am: f6975e3532

Change-Id: I9955f3878ec97815a359af945f3af60d319d3a86

jni/plugins/genPCLm/src/genPCLm.cpp

diff --git a/jni/plugins/genPCLm/src/genPCLm.cpp b/jni/plugins/genPCLm/src/genPCLm.cpp
index 5226385..0aab701 100644
--- a/jni/plugins/genPCLm/src/genPCLm.cpp
+++ b/jni/plugins/genPCLm/src/genPCLm.cpp
@@ -1712,10 +1712,13 @@
                 destColorSpace);
     }
 
-#ifdef SUPPORT_WHITE_STRIPS
-    bool whiteStrip = isWhiteStrip(pInBuffer, thisHeight * currSourceWidth * srcNumComponents);
-#else
     bool whiteStrip = false;
+#ifdef SUPPORT_WHITE_STRIPS
+    if (!firstStrip) {
+        // PCLm does not print a blank page if all the strips are marked as "/Name /WhiteStrip"
+        // so only apply /WhiteStrip to strips after the first
+        whiteStrip = isWhiteStrip(pInBuffer, thisHeight * currSourceWidth * srcNumComponents);
+    }
 #endif
 
     if (currCompressionDisposition == compressDCT) {
@@ -1743,8 +1746,8 @@
             }
 
             free(tmpStrip);
-            firstStrip = false;
         }
+        firstStrip = false;
 
         // We are always going to compress the full strip height, even though the image may be less;
         // this allows the compressed images to be symmetric
@@ -1796,8 +1799,8 @@
                         numPartialScanlinesToInject, destColorSpace, true);
             }
             free(tmpStrip);
-            firstStrip = false;
         }
+        firstStrip = false;
 
         if (newStripPtr) {
             result = compress(scratchBuffer, &destSize, (const Bytef *) newStripPtr,
@@ -1836,8 +1839,8 @@
             }
 
             free(tmpStrip);
-            firstStrip = false;
         }
+        firstStrip = false;
 
         if (newStripPtr) {
             compSize = RLEEncodeImage(newStripPtr, scratchBuffer,

jni/plugins/lib_pclm.c

diff --git a/jni/plugins/lib_pclm.c b/jni/plugins/lib_pclm.c
index 416a745..5f25e92 100644
--- a/jni/plugins/lib_pclm.c
+++ b/jni/plugins/lib_pclm.c
@@ -273,6 +273,10 @@
     if (page_number == -1) {
         LOGI("_end_page(): writing blank page");
         _start_page(job_info, 0, 0);
+        unsigned char blank_data[1] = {0xFF};
+        PCLmEncapsulate(job_info->pclmgen_obj, (void *) blank_data, 1, 1,
+                (void **) &job_info->pclm_output_buffer, &outBuffSize);
+        _WRITE(job_info, (const char *) job_info->pclm_output_buffer, outBuffSize);
     }
     LOGI("_end_page()");
     PCLmEndPage(job_info->pclmgen_obj, (void **) &job_info->pclm_output_buffer, &outBuffSize);