Add postscript path

core/fxge/win32/cfx_psrenderer.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/win32/cfx_psrenderer.h"
 
 #include <memory>
 
@@ skipping 25 matching lines @@
   m_bInited = false;
 }
 
 CFX_PSRenderer::~CFX_PSRenderer() {
   for (int i = 0; i < static_cast<int>(m_PSFontList.GetSize()); i++) {
     CPSFont* pFont = m_PSFontList[i];
     delete pFont;
   }
 }
 
-#define OUTPUT_PS(str) m_pOutput->OutputPS(str, sizeof str - 1)
+#define OUTPUT_PS(str) m_pOutput->OutputPS(str, sizeof(str) - 1)
 
 void CFX_PSRenderer::Init(CPSOutput* pOutput,
                           int pslevel,
                           int width,
                           int height,
                           bool bCmykOutput) {
   m_PSLevel = pslevel;
   m_pOutput = pOutput;
   m_ClipBox.left = m_ClipBox.top = 0;
   m_ClipBox.right = width;
@@ skipping 66 matching lines @@
     FX_FLOAT y = pPathData->GetPointY(i);
     if (pObject2Device) {
       pObject2Device->Transform(x, y);
     }
     buf << x << " " << y;
     switch (flag & FXPT_TYPE) {
       case FXPT_MOVETO:
         buf << " m ";
         break;
       case FXPT_LINETO:
-        if (flag & FXPT_CLOSEFIGURE) {
-          buf << " l h ";
-        } else {
-          buf << " l ";
-        }
+        buf << " l ";
+        if (flag & FXPT_CLOSEFIGURE)
+          buf << "h ";
         break;
       case FXPT_BEZIERTO: {
         FX_FLOAT x1 = pPathData->GetPointX(i + 1);
         FX_FLOAT x2 = pPathData->GetPointX(i + 2);
         FX_FLOAT y1 = pPathData->GetPointY(i + 1);
         FX_FLOAT y2 = pPathData->GetPointY(i + 2);
         if (pObject2Device) {
           pObject2Device->Transform(x1, y1);
           pObject2Device->Transform(x2, y2);
         }
-        buf << " " << x1 << " " << y1 << " " << x2 << " " << y2;
-        if (flag & FXPT_CLOSEFIGURE) {
-          buf << " c h\n";
-        } else {
-          buf << " c\n";
-        }
+        buf << " " << x1 << " " << y1 << " " << x2 << " " << y2 << " c";
+        if (flag & FXPT_CLOSEFIGURE)
+          buf << " h";
+        buf << "\n";
         i += 2;
         break;
       }
     }
   }
   m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
 }
 
 void CFX_PSRenderer::SetClip_PathFill(const CFX_PathData* pPathData,
                                       const CFX_Matrix* pObject2Device,
                                       int fill_mode) {
   StartRendering();
   OutputPath(pPathData, pObject2Device);
   CFX_FloatRect rect = pPathData->GetBoundingBox();
-  if (pObject2Device) {
+  if (pObject2Device)
     rect.Transform(pObject2Device);
-  }
-  m_ClipBox.Intersect(rect.GetOuterRect());
+  m_ClipBox.left = static_cast<int>(rect.left);
+  m_ClipBox.right = static_cast<int>(rect.left + rect.right);
+  m_ClipBox.top = static_cast<int>(rect.top + rect.bottom);
+  m_ClipBox.bottom = static_cast<int>(rect.bottom);
   if ((fill_mode & 3) == FXFILL_WINDING) {
     OUTPUT_PS("W n\n");
   } else {
     OUTPUT_PS("W* n\n");
   }
 }
 
 void CFX_PSRenderer::SetClip_PathStroke(const CFX_PathData* pPathData,
                                         const CFX_Matrix* pObject2Device,
                                         const CFX_GraphStateData* pGraphState) {
@@ skipping 79 matching lines @@
   CFX_ByteTextBuf buf;
   if (!m_bGraphStateSet ||
       m_CurGraphState.m_LineCap != pGraphState->m_LineCap) {
     buf << pGraphState->m_LineCap << " J\n";
   }
   if (!m_bGraphStateSet ||
       m_CurGraphState.m_DashCount != pGraphState->m_DashCount ||
       FXSYS_memcmp(m_CurGraphState.m_DashArray, pGraphState->m_DashArray,
                    sizeof(FX_FLOAT) * m_CurGraphState.m_DashCount)) {
     buf << "[";
-    for (int i = 0; i < pGraphState->m_DashCount; i++) {
+    for (int i = 0; i < pGraphState->m_DashCount; ++i) {
       buf << pGraphState->m_DashArray[i] << " ";
     }
     buf << "]" << pGraphState->m_DashPhase << " d\n";
   }
   if (!m_bGraphStateSet ||
       m_CurGraphState.m_LineJoin != pGraphState->m_LineJoin) {
     buf << pGraphState->m_LineJoin << " j\n";
   }
   if (!m_bGraphStateSet ||
       m_CurGraphState.m_LineWidth != pGraphState->m_LineWidth) {
     buf << pGraphState->m_LineWidth << " w\n";
   }
   if (!m_bGraphStateSet ||
       m_CurGraphState.m_MiterLimit != pGraphState->m_MiterLimit) {
     buf << pGraphState->m_MiterLimit << " M\n";
   }
   m_CurGraphState.Copy(*pGraphState);
-  m_bGraphStateSet = TRUE;
+  m_bGraphStateSet = true;
   if (buf.GetSize()) {
     m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
   }
 }
 
 static void FaxCompressData(uint8_t* src_buf,
                             int width,
                             int height,
                             std::unique_ptr<uint8_t, FxFreeDeleter>* dest_buf,
                             uint32_t* dest_size) {
   if (width * height > 128) {
     CCodec_FaxModule::FaxEncode(src_buf, width, height, (width + 7) / 8,
                                 dest_buf, dest_size);
     FX_Free(src_buf);
   } else {
-    (*dest_buf).reset(src_buf);
+    dest_buf->reset(src_buf);
     *dest_size = (width + 7) / 8 * height;
   }
 }
 
 static void PSCompressData(int PSLevel,
                            uint8_t* src_buf,
                            uint32_t src_size,
                            uint8_t** output_buf,
                            uint32_t* output_size,
                            const FX_CHAR** filter) {
   *output_buf = src_buf;
   *output_size = src_size;
   *filter = "";
   if (src_size < 1024) {
     return;
   }
   CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
-  uint8_t* dest_buf = NULL;
+  uint8_t* dest_buf = nullptr;
   uint32_t dest_size = src_size;
   if (PSLevel >= 3) {
     if (pEncoders &&
         pEncoders->GetFlateModule()->Encode(src_buf, src_size, &dest_buf,
                                             &dest_size)) {
       *filter = "/FlateDecode filter ";
     }
   } else {
     if (pEncoders &&
         pEncoders->GetBasicModule()->RunLengthEncode(src_buf, src_size,
                                                      &dest_buf, &dest_size)) {
       *filter = "/RunLengthDecode filter ";
     }
   }
   if (dest_size < src_size) {
     *output_buf = dest_buf;
     *output_size = dest_size;
   } else {
-    *filter = NULL;
+    *filter = nullptr;
     FX_Free(dest_buf);
   }
 }
 
 bool CFX_PSRenderer::SetDIBits(const CFX_DIBSource* pSource,
                                uint32_t color,
                                int left,
                                int top) {
   StartRendering();
   CFX_Matrix matrix((FX_FLOAT)(pSource->GetWidth()), 0.0f, 0.0f,
@@ skipping 52 matching lines @@
     FaxCompressData(src_buf, width, height, &output_buf, &output_size);
     if (pSource->IsAlphaMask()) {
       SetColor(color);
       m_bColorSet = false;
       buf << " true[";
     } else {
       buf << " 1[";
     }
     buf << width << " 0 0 -" << height << " 0 " << height
         << "]currentfile/ASCII85Decode filter ";
-    if (output_buf.get() != src_buf)
+    if (output_buf.get() != src_buf) {
       buf << "<</K -1/EndOfBlock false/Columns " << width << "/Rows " << height
           << ">>/CCITTFaxDecode filter ";
+    }
     if (pSource->IsAlphaMask()) {
       buf << "iM\n";
     } else {
       buf << "false 1 colorimage\n";
     }
     m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
     WritePSBinary(output_buf.get(), output_size);
     output_buf.release();
   } else {
-    CFX_MaybeOwned<CFX_DIBSource> pConverted((CFX_DIBSource*)pSource);
+    CFX_DIBExtractor source_extractor(pSource);
+    CFX_MaybeOwned<CFX_DIBSource> pConverted(source_extractor.GetBitmap());
+    if (!pConverted.Get())
+      return false;
     switch (pSource->GetFormat()) {
       case FXDIB_1bppRgb:
       case FXDIB_Rgb32:
-        pConverted = pSource->CloneConvert(FXDIB_Rgb);
+        pConverted = pConverted->CloneConvert(FXDIB_Rgb).release();
         break;
       case FXDIB_8bppRgb:
         if (pSource->GetPalette()) {
-          pConverted = pSource->CloneConvert(FXDIB_Rgb);
+          pConverted = pConverted->CloneConvert(FXDIB_Rgb).release();
         }
         break;
       case FXDIB_1bppCmyk:
-        pConverted = pSource->CloneConvert(FXDIB_Cmyk);
+        pConverted = pConverted->CloneConvert(FXDIB_Cmyk).release();
         break;
       case FXDIB_8bppCmyk:
         if (pSource->GetPalette()) {
-          pConverted = pSource->CloneConvert(FXDIB_Cmyk);
+          pConverted = pConverted->CloneConvert(FXDIB_Cmyk).release();
         }
         break;
       default:
         break;
     }
     if (!pConverted) {
       OUTPUT_PS("\nQ\n");
       return false;
     }
-    int Bpp = pConverted->GetBPP() / 8;
+    int bpp = pConverted->GetBPP() / 8;
     uint8_t* output_buf = nullptr;
     FX_STRSIZE output_size = 0;
     const FX_CHAR* filter = nullptr;
-    if (flags & FXRENDER_IMAGE_LOSSY) {
-      CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
-      if (pEncoders &&
-          pEncoders->GetJpegModule()->JpegEncode(pConverted.Get(), &output_buf,
-                                                 &output_size)) {
-        filter = "/DCTDecode filter ";
-      }
+    if ((/*m_PSLevel == 2 || */ flags & FXRENDER_IMAGE_LOSSY) &&

[Tom Sepez, 2017/01/10 21:08:41]

Just remove it, we have source control if we want to go back in time ...

[rbpotter, 2017/01/11 20:34:49]

This was actually commented out to test something, should actually stay the way
it was. Sorry about that.

+        CCodec_JpegModule::JpegEncode(pConverted.Get(), &output_buf,
+                                      &output_size)) {
+      filter = "/DCTDecode filter ";
     }
     if (!filter) {
-      int src_pitch = width * Bpp;
+      int src_pitch = width * bpp;
       output_size = height * src_pitch;
       output_buf = FX_Alloc(uint8_t, output_size);
       for (int row = 0; row < height; row++) {
         const uint8_t* src_scan = pConverted->GetScanline(row);
         uint8_t* dest_scan = output_buf + row * src_pitch;
-        if (Bpp == 3) {
+        if (bpp == 3) {
           for (int col = 0; col < width; col++) {
             *dest_scan++ = src_scan[2];
             *dest_scan++ = src_scan[1];
             *dest_scan++ = *src_scan;
             src_scan += 3;
           }
         } else {
           FXSYS_memcpy(dest_scan, src_scan, src_pitch);
         }
       }
       uint8_t* compressed_buf;
       uint32_t compressed_size;
       PSCompressData(m_PSLevel, output_buf, output_size, &compressed_buf,
                      &compressed_size, &filter);
       if (output_buf != compressed_buf) {
         FX_Free(output_buf);
       }
       output_buf = compressed_buf;
       output_size = compressed_size;
     }
-    CFX_DIBSource* converted = pConverted.Get();
-    if (converted != pSource) {
-      delete converted;
-      pConverted.Reset();
-    }
     buf << " 8[";
     buf << width << " 0 0 -" << height << " 0 " << height << "]";
     buf << "currentfile/ASCII85Decode filter ";
     if (filter) {
       buf << filter;
     }
-    buf << "false " << Bpp;
+    buf << "false " << bpp;
     buf << " colorimage\n";
     m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
     WritePSBinary(output_buf, output_size);
     FX_Free(output_buf);
   }
   OUTPUT_PS("\nQ\n");
   return true;
 }
 
 void CFX_PSRenderer::SetColor(uint32_t color) {
@@ skipping 15 matching lines @@
     }
     m_pOutput->OutputPS((const FX_CHAR*)buf.GetBuffer(), buf.GetSize());
   }
 }
 
 void CFX_PSRenderer::FindPSFontGlyph(CFX_FaceCache* pFaceCache,
                                      CFX_Font* pFont,
                                      const FXTEXT_CHARPOS& charpos,
                                      int* ps_fontnum,
                                      int* ps_glyphindex) {
-  for (int i = 0; i < m_PSFontList.GetSize(); i++) {
+  for (int i = 0; i < (int)m_PSFontList.GetSize(); i++) {
     CPSFont* pPSFont = m_PSFontList[i];
     for (int j = 0; j < pPSFont->m_nGlyphs; j++)
       if (pPSFont->m_Glyphs[j].m_pFont == pFont &&
           pPSFont->m_Glyphs[j].m_GlyphIndex == charpos.m_GlyphIndex) {
         if ((!pPSFont->m_Glyphs[j].m_bGlyphAdjust && !charpos.m_bGlyphAdjust) ||
             (pPSFont->m_Glyphs[j].m_bGlyphAdjust && charpos.m_bGlyphAdjust &&
              (FXSYS_fabs(pPSFont->m_Glyphs[j].m_AdjustMatrix[0] -
                          charpos.m_AdjustMatrix[0]) < 0.01 &&
               FXSYS_fabs(pPSFont->m_Glyphs[j].m_AdjustMatrix[1] -
                          charpos.m_AdjustMatrix[1]) < 0.01 &&
@@ skipping 133 matching lines @@
   CCodec_ModuleMgr* pEncoders = CFX_GEModule::Get()->GetCodecModule();
   if (pEncoders &&
       pEncoders->GetBasicModule()->A85Encode(data, len, &dest_buf,
                                              &dest_size)) {
     m_pOutput->OutputPS((const FX_CHAR*)dest_buf, dest_size);
     FX_Free(dest_buf);
   } else {
     m_pOutput->OutputPS((const FX_CHAR*)data, len);
   }
 }