Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp

Issue 1253603002: Fix FX_BOOL type mismatches. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Public API Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/include/fxge/fx_font.h ('k') | core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "../../../include/fpdfapi/fpdf_module.h" 7 #include "../../../include/fpdfapi/fpdf_module.h"
8 #include "../../../include/fpdfapi/fpdf_page.h" 8 #include "../../../include/fpdfapi/fpdf_page.h"
9 #include "../../../include/fxcodec/fx_codec.h" 9 #include "../../../include/fxcodec/fx_codec.h"
10 #include "../../../include/fpdfapi/fpdf_render.h" 10 #include "../../../include/fpdfapi/fpdf_render.h"
11 #include "../fpdf_page/pageint.h" 11 #include "../fpdf_page/pageint.h"
12 #include "../fpdf_render/render_int.h" 12 #include "../fpdf_render/render_int.h"
13 CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) 13 CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size)
14 { 14 {
15 int32_t width, height, color_trans, num_comps, bits; 15 int32_t width;
16 int32_t height;
17 int32_t num_comps;
18 int32_t bits;
19 FX_BOOL color_trans;
16 if (!CPDF_ModuleMgr::Get()->GetJpegModule()-> 20 if (!CPDF_ModuleMgr::Get()->GetJpegModule()->
17 LoadInfo(pData, size, width, height, num_comps, bits, color_trans)) { 21 LoadInfo(pData, size, width, height, num_comps, bits, color_trans)) {
18 return NULL; 22 return NULL;
19 } 23 }
20 CPDF_Dictionary* pDict = new CPDF_Dictionary; 24 CPDF_Dictionary* pDict = new CPDF_Dictionary;
21 pDict->SetAtName("Type", "XObject"); 25 pDict->SetAtName("Type", "XObject");
22 pDict->SetAtName("Subtype", "Image"); 26 pDict->SetAtName("Subtype", "Image");
23 pDict->SetAtInteger("Width", width); 27 pDict->SetAtInteger("Width", width);
24 pDict->SetAtInteger("Height", height); 28 pDict->SetAtInteger("Height", height);
25 const FX_CHAR* csname = NULL; 29 const FX_CHAR* csname = NULL;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 m_Width = BitmapWidth; 360 m_Width = BitmapWidth;
357 m_Height = BitmapHeight; 361 m_Height = BitmapHeight;
358 if (dest_buf) { 362 if (dest_buf) {
359 FX_Free(dest_buf); 363 FX_Free(dest_buf);
360 } 364 }
361 } 365 }
362 void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap) 366 void CPDF_Image::ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pBitmap)
363 { 367 {
364 pPage->GetRenderCache()->ResetBitmap(m_pStream, pBitmap); 368 pPage->GetRenderCache()->ResetBitmap(m_pStream, pBitmap);
365 } 369 }
OLDNEW
« no previous file with comments | « core/include/fxge/fx_font.h ('k') | core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698