X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fjpeg_frame_view.cpp;h=adc376455ec4eb06c7f8e5550b38037fa1aebeb8;hp=943b3e15ac5858886472c1866371debc9e6eb733;hb=622b1e84c60f315cf2980efbf1b54cc049a7d2ce;hpb=adf28dcc8d96304785b05034c323e4c854c76896

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index 943b3e1..adc3764 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -109,6 +109,8 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
 		return get_black_frame();
 	}
 
+	jpeg_save_markers(&dinfo, JPEG_APP0 + 1, 0xFFFF);
+
 	if (dinfo.num_components != 3) {
 		fprintf(stderr, "Not a color JPEG. (%d components, Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
 		        dinfo.num_components,
@@ -159,6 +161,14 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
 	frame->pitch_y = luma_width_blocks * DCTSIZE;
 	frame->pitch_chroma = chroma_width_blocks * DCTSIZE;
 
+	if (dinfo.marker_list != nullptr &&
+	    dinfo.marker_list->marker == JPEG_APP0 + 1 &&
+	    dinfo.marker_list->data_length >= 4 &&
+	    memcmp(dinfo.marker_list->data, "Exif", 4) == 0) {
+		frame->exif_data.assign(reinterpret_cast<char *>(dinfo.marker_list->data),
+			dinfo.marker_list->data_length);
+	}
+
 	if (!error_mgr.run([&dinfo, &frame, v_mcu_size, mcu_height_blocks] {
 		    JSAMPROW yptr[v_mcu_size], cbptr[v_mcu_size], crptr[v_mcu_size];
 		    JSAMPARRAY data[3] = { yptr, cbptr, crptr };
@@ -415,6 +425,7 @@ void JPEGFrameView::paintGL()
 			overlay_input->set_width(overlay_width);
 			overlay_input->set_height(overlay_height);
 			overlay_input->set_pixel_data(overlay_image->bits());
+			overlay_input_needs_refresh = false;
 		}
 		glViewport(gl_width - overlay_width, 0, overlay_width, overlay_height);
 		overlay_chain->render_to_screen();