Fix a dangling reference (found by GCC 14).

[nageru] / futatabi / jpeg_frame_view.cpp

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index ff4fcb8242d7e0d565b4de840d3af30f3506c840..6ab19482fb93772956036c19175b6ecef36262e3 100644 (file)
--- 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,
@@ -210,6 +210,7 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
        glFlushMappedNamedBufferRange(pbo.pbo, 0, dinfo.image_width * dinfo.image_height + chroma_width * chroma_height * 2);
        glMemoryBarrier(GL_PIXEL_BUFFER_BARRIER_BIT);
        pbo.upload_done = RefCountedGLsync(GL_SYNC_GPU_COMMANDS_COMPLETE, /*flags=*/0);
+       glFlush();
        frame->uploaded_ui_thread = pbo.upload_done;
        frame->uploaded_interpolation = pbo.upload_done;
        global_pbo_pool->release_pbo(move(pbo));
@@ -411,6 +412,7 @@ void JPEGFrameView::setFrame(shared_ptr<Frame> frame)
        lock_guard<mutex> lock(cache_mu);
        PendingDecode decode;
        decode.frame = std::move(frame);
+       decode.fade_alpha = 0.0f;
        pending_decodes.push_back(decode);
        any_pending_decodes.notify_all();
 }