X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=futatabi%2Fjpeg_frame_view.cpp;fp=futatabi%2Fjpeg_frame_view.cpp;h=af894328dc1f27cd311796707d16d3327e685692;hb=26a5c1c6a939fba538d96254181f32218ac42b71;hp=ff4fcb8242d7e0d565b4de840d3af30f3506c840;hpb=403942c08c2403321fcfd5e6c5f2e6aa7c099874;p=nageru

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index ff4fcb8..af89432 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -112,6 +112,8 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
 	}
 	JPEGDestroyer destroy_dinfo(&dinfo);
 
+	jpeg_save_markers(&dinfo, JPEG_APP0 + 1, 0xFFFF);
+
 	if (!error_mgr.run([&dinfo, &jpeg] {
 		    jpeg_mem_src(&dinfo, reinterpret_cast<const unsigned char *>(jpeg.data()), jpeg.size());
 		    jpeg_read_header(&dinfo, true);
@@ -119,8 +121,6 @@ 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,