forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ketmar fix

This commit is contained in:
Adam D. Ruppe 2017-12-16 08:53:16 -05:00
parent 023aa9fa06
commit 941d618152
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
jpeg.d
View File

@ -488,7 +488,10 @@ public:
decode_start(); decode_start();
m_ready_flag = true; m_ready_flag = true;
return JPGD_SUCCESS; return JPGD_SUCCESS;
} catch (Exception) {} } catch (Exception e) {
//version(jpegd_test) {{ import core.stdc.stdio; stderr.fprintf("ERROR: %.*s...\n", cast(int)e.msg.length, e.msg.ptr); }}
version(jpegd_test) {{ import std.stdio; stderr.writeln(e.toString); }}
}
return JPGD_FAILED; return JPGD_FAILED;
} }
@ -1002,11 +1005,11 @@ private:
// This method handles all errors. It will never return. // This method handles all errors. It will never return.
// It could easily be changed to use C++ exceptions. // It could easily be changed to use C++ exceptions.
/*JPGD_NORETURN*/ void stop_decoding (jpgd_status status) { /*JPGD_NORETURN*/ void stop_decoding (jpgd_status status, size_t line=__LINE__) {
m_error_code = status; m_error_code = status;
free_all_blocks(); free_all_blocks();
//longjmp(m_jmp_state, status); //longjmp(m_jmp_state, status);
throw new Exception("jpeg decoding error"); throw new Exception("jpeg decoding error", __FILE__, line);
} }
void* alloc (size_t nSize, bool zero=false) { void* alloc (size_t nSize, bool zero=false) {
@ -2480,13 +2483,28 @@ private:
if (m_comps_in_frame == 1) if (m_comps_in_frame == 1)
{ {
if ((m_comp_h_samp.ptr[0] != 1) || (m_comp_v_samp.ptr[0] != 1)) version(jpegd_test) {{ import std.stdio; stderr.writeln("m_comp_h_samp=", m_comp_h_samp.ptr[0], "; m_comp_v_samp=", m_comp_v_samp.ptr[0]); }}
stop_decoding(JPGD_UNSUPPORTED_SAMP_FACTORS);
m_scan_type = JPGD_GRAYSCALE; //if ((m_comp_h_samp.ptr[0] != 1) || (m_comp_v_samp.ptr[0] != 1))
m_max_blocks_per_mcu = 1; // stop_decoding(JPGD_UNSUPPORTED_SAMP_FACTORS);
m_max_mcu_x_size = 8;
m_max_mcu_y_size = 8; if ((m_comp_h_samp.ptr[0] == 1) && (m_comp_v_samp.ptr[0] == 1))
{
m_scan_type = JPGD_GRAYSCALE;
m_max_blocks_per_mcu = 1;
m_max_mcu_x_size = 8;
m_max_mcu_y_size = 8;
}
else if ((m_comp_h_samp.ptr[0] == 2) && (m_comp_v_samp.ptr[0] == 2))
{
//k8: i added this, and i absolutely don't know what it means; but it decoded two sample images i found
m_scan_type = JPGD_GRAYSCALE;
m_max_blocks_per_mcu = 4;
m_max_mcu_x_size = 8;
m_max_mcu_y_size = 8;
}
else
stop_decoding(JPGD_UNSUPPORTED_SAMP_FACTORS);
} }
else if (m_comps_in_frame == 3) else if (m_comps_in_frame == 3)
{ {
@ -3227,6 +3245,8 @@ public MemoryImage readJpegFromStream (scope JpegStreamReadFunc rfn) {
//height = image_height; //height = image_height;
//actual_comps = decoder.num_components; //actual_comps = decoder.num_components;
version(jpegd_test) {{ import core.stdc.stdio; stderr.fprintf("starting (%dx%d)...\n", image_width, image_height); }}
if (decoder.begin_decoding() != JPGD_SUCCESS || image_width < 1 || image_height < 1) return null; if (decoder.begin_decoding() != JPGD_SUCCESS || image_width < 1 || image_height < 1) return null;
immutable int dst_bpl = image_width*req_comps; immutable int dst_bpl = image_width*req_comps;
@ -3234,6 +3254,8 @@ public MemoryImage readJpegFromStream (scope JpegStreamReadFunc rfn) {
ubyte* pImage_data = img.imageData.bytes.ptr; ubyte* pImage_data = img.imageData.bytes.ptr;
for (int y = 0; y < image_height; ++y) { for (int y = 0; y < image_height; ++y) {
//version(jpegd_test) {{ import core.stdc.stdio; stderr.fprintf("loading line %d...\n", y); }}
const(ubyte)* pScan_line; const(ubyte)* pScan_line;
uint scan_line_len; uint scan_line_len;
if (decoder.decode(/*(const void**)*/cast(void**)&pScan_line, &scan_line_len) != JPGD_SUCCESS) { if (decoder.decode(/*(const void**)*/cast(void**)&pScan_line, &scan_line_len) != JPGD_SUCCESS) {