Attachment #518274 for bug #646456

View | Details | Raw Unified | Return to bug 646456
Collapse All | Expand All




};
extern "C" {
static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
  return FALSE;
}
};
extern "C" {
static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
  return FALSE;
}
};
extern "C" {

    jpeg_destroy_decompress(&cinfo);
    return false;
  }
  int ret = jpeg_read_header(&cinfo, TRUE);
  if (ret != JPEG_HEADER_OK) {
    jpeg_destroy_decompress(&cinfo);
    return false;

  }
  cinfo.image_width = m_OrigWidth;
  cinfo.image_height = m_OrigHeight;
  int ret = jpeg_read_header(&cinfo, TRUE);
  if (ret != JPEG_HEADER_OK)
    return false;


  if (setjmp(ctx->m_JumpMark) == -1)
    return 1;

  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
  if (ret == JPEG_SUSPENDED)
    return 2;
  if (ret != JPEG_HEADER_OK)

Return to bug 646456

Lines 57-68 Link Here

(-)a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp (-5 / +5 lines)
57	};	57	};
58	extern "C" {	58	extern "C" {
59	static boolean _src_fill_buffer(j_decompress_ptr cinfo) {	59	static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
60	return 0;	60	return FALSE;
61	}	61	}
62	};	62	};
63	extern "C" {	63	extern "C" {
64	static boolean _src_resync(j_decompress_ptr cinfo, int desired) {	64	static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
65	return 0;	65	return FALSE;
66	}	66	}
67	};	67	};
68	extern "C" {	68	extern "C" {
Lines 126-132 Link Here
126	jpeg_destroy_decompress(&cinfo);	126	jpeg_destroy_decompress(&cinfo);
127	return false;	127	return false;
128	}	128	}
129	int ret = jpeg_read_header(&cinfo, true);	129	int ret = jpeg_read_header(&cinfo, TRUE);
130	if (ret != JPEG_HEADER_OK) {	130	if (ret != JPEG_HEADER_OK) {
131	jpeg_destroy_decompress(&cinfo);	131	jpeg_destroy_decompress(&cinfo);
132	return false;	132	return false;
Lines 210-216 Link Here
210	}	210	}
211	cinfo.image_width = m_OrigWidth;	211	cinfo.image_width = m_OrigWidth;
212	cinfo.image_height = m_OrigHeight;	212	cinfo.image_height = m_OrigHeight;
213	int ret = jpeg_read_header(&cinfo, true);	213	int ret = jpeg_read_header(&cinfo, TRUE);
214	if (ret != JPEG_HEADER_OK)	214	if (ret != JPEG_HEADER_OK)
215	return false;	215	return false;
216		216
Lines 433-439 Link Here
433	if (setjmp(ctx->m_JumpMark) == -1)	433	if (setjmp(ctx->m_JumpMark) == -1)
434	return 1;	434	return 1;
435		435
436	int ret = jpeg_read_header(&ctx->m_Info, true);	436	int ret = jpeg_read_header(&ctx->m_Info, TRUE);
437	if (ret == JPEG_SUSPENDED)	437	if (ret == JPEG_SUSPENDED)
438	return 2;	438	return 2;
439	if (ret != JPEG_HEADER_OK)	439	if (ret != JPEG_HEADER_OK)