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

Side by Side Diff: core/src/fxcodec/codec/fx_codec_jpx_opj.cpp

Issue 1026843002: Fix missing include for std::min (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | no next file » | 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 <algorithm>
7 #include <limits> 8 #include <limits>
8 9
9 #include "../../../include/fxcodec/fx_codec.h" 10 #include "../../../include/fxcodec/fx_codec.h"
10 #include "codec_int.h" 11 #include "codec_int.h"
11 #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" 12 #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h"
12 #include "../lcms2/include/fx_lcms2.h" 13 #include "../lcms2/include/fx_lcms2.h"
13 14
14 static void fx_error_callback(const char *msg, void *client_data) 15 static void fx_error_callback(const char *msg, void *client_data)
15 { 16 {
16 (void)client_data; 17 (void)client_data;
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 FX_BOOL CCodec_JpxModule::Decode(void* ctx, FX_LPBYTE dest_data, int pitch, FX_B OOL bTranslateColor, FX_LPBYTE offsets) 821 FX_BOOL CCodec_JpxModule::Decode(void* ctx, FX_LPBYTE dest_data, int pitch, FX_B OOL bTranslateColor, FX_LPBYTE offsets)
821 { 822 {
822 CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx; 823 CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
823 return pDecoder->Decode(dest_data, pitch, bTranslateColor, offsets); 824 return pDecoder->Decode(dest_data, pitch, bTranslateColor, offsets);
824 } 825 }
825 void CCodec_JpxModule::DestroyDecoder(void* ctx) 826 void CCodec_JpxModule::DestroyDecoder(void* ctx)
826 { 827 {
827 CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx; 828 CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
828 delete pDecoder; 829 delete pDecoder;
829 } 830 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698