cleanup

Author: salarkhan

opencv.go

@@ -836,9 +836,7 @@ func (e *openCVEncoder) Encode(f *Framebuffer, opt map[int]int) ([]byte, error)
 		firstOpt = (*C.int)(unsafe.Pointer(&optList[0]))
 	}
 
-	success := bool(C.opencv_encoder_write(e.encoder, f.mat, firstOpt, C.size_t(len(optList))))
-
-	if !success {
+	if !C.opencv_encoder_write(e.encoder, f.mat, firstOpt, C.size_t(len(optList))) {
 		return nil, ErrInvalidImage
 	}
 

opencv_test.go

@@ -269,7 +269,7 @@ func TestICC(t *testing.T) {
 
 			// try encoding a WebP image, including ICC profile data when available
 			dstBuf := make([]byte, destinationBufferSize)
-			encoder, err := newWebpEncoder(decoder, dstBuf, false)
+			encoder, err := newWebpEncoder(decoder, dstBuf)
 			if err != nil {
 				t.Fatalf("Failed to create a new webp encoder: %v", err)
 			}
@@ -292,76 +292,3 @@ func TestICC(t *testing.T) {
 	}
 }
 
-// TestStandaloneToneMapping tests the standalone tone mapping API
-func TestStandaloneToneMapping(t *testing.T) {
-	// Test that tone mapping can be applied independently of encoding
-	hdrPngData, err := ioutil.ReadFile("data/hdr-ohmama.png")
-	if err != nil {
-		t.Skipf("HDR test image not found: %v", err)
-	}
-
-	decoder, err := NewDecoder(hdrPngData)
-	if err != nil {
-		t.Fatalf("Failed to create decoder: %v", err)
-	}
-	defer decoder.Close()
-
-	header, err := decoder.Header()
-	if err != nil {
-		t.Fatalf("Failed to read header: %v", err)
-	}
-
-	// Create a framebuffer and decode the image
-	fb := NewFramebuffer(header.Width(), header.Height())
-	defer fb.Close()
-
-	if err := decoder.DecodeTo(fb); err != nil {
-		t.Fatalf("Failed to decode: %v", err)
-	}
-
-	// Get the ICC profile
-	icc := decoder.ICC()
-	if len(icc) == 0 {
-		t.Skip("No ICC profile found in test image")
-	}
-
-	// Apply tone mapping as a standalone operation
-	if err := fb.ApplyToneMapping(icc); err != nil {
-		t.Fatalf("Failed to apply tone mapping: %v", err)
-	}
-
-	// Verify the framebuffer is still valid
-	if fb.Width() != header.Width() || fb.Height() != header.Height() {
-		t.Fatalf("Framebuffer dimensions changed after tone mapping: got %dx%d, want %dx%d",
-			fb.Width(), fb.Height(), header.Width(), header.Height())
-	}
-
-	// Now encode to multiple formats to demonstrate independence
-	outputBuf := make([]byte, 50*1024*1024)
-
-	for _, format := range []string{".png", ".webp"} {
-		encodeOptions := map[int]int{}
-		if format == ".png" {
-			encodeOptions[PngCompression] = 7
-		} else if format == ".webp" {
-			encodeOptions[WebpQuality] = 85
-		}
-
-		// Create encoder without ForceSdr since we already tone-mapped
-		encoder, err := NewEncoder(format, decoder, outputBuf)
-		if err != nil {
-			t.Fatalf("Failed to create %s encoder: %v", format, err)
-		}
-
-		encoded, err := encoder.Encode(fb, encodeOptions)
-		if err != nil {
-			t.Fatalf("Failed to encode to %s: %v", format, err)
-		}
-
-		if len(encoded) == 0 {
-			t.Fatalf("Encoded %s data is empty", format)
-		}
-
-		encoder.Close()
-	}
-}

webp.cpp

@@ -1,14 +1,11 @@
 #include "webp.hpp"
-#include "tone_mapping.hpp"
 #include <opencv2/imgproc.hpp>
 #include <webp/decode.h>
 #include <webp/encode.h>
 #include <webp/mux.h>
 #include <webp/mux_types.h>
 #include <webp/demux.h>
 #include <stdbool.h>
-#include <lcms2.h>
-#include <memory>
 
 struct webp_decoder_struct {
     WebPMux* mux;

webp.go

@@ -228,10 +228,7 @@ func (e *webpEncoder) Encode(f *Framebuffer, opt map[int]int) ([]byte, error) {
 
 	// Encode the current frame
 	frameDelay := int(f.duration.Milliseconds())
-
-	length := C.webp_encoder_write(e.encoder, f.mat, firstOpt, C.size_t(len(optList)),
-		C.int(frameDelay), C.int(f.blend), C.int(f.dispose), 0, 0)
-
+	length := C.webp_encoder_write(e.encoder, f.mat, firstOpt, C.size_t(len(optList)), C.int(frameDelay), C.int(f.blend), C.int(f.dispose), 0, 0)
 	if length == 0 {
 		return nil, ErrInvalidImage
 	}

webp_test.go

@@ -75,7 +75,7 @@ func testNewWebpEncoder(t *testing.T) {
 			defer decoder.Close()
 
 			dstBuf := make([]byte, destinationBufferSize)
-			encoder, err := newWebpEncoder(decoder, dstBuf, false)
+			encoder, err := newWebpEncoder(decoder, dstBuf)
 			if err != nil {
 				t.Fatalf("Unexpected error: %v", err)
 			}
@@ -161,7 +161,7 @@ func testWebpEncoderEncode(t *testing.T) {
 			}
 
 			dstBuf := make([]byte, destinationBufferSize)
-			encoder, err := newWebpEncoder(decoder, dstBuf, false)
+			encoder, err := newWebpEncoder(decoder, dstBuf)
 			if err != nil {
 				t.Fatalf("Failed to create a new webp encoder: %v", err)
 			}
@@ -195,7 +195,7 @@ func testWebpEncoderEncode(t *testing.T) {
 		defer decoder.Close()
 
 		dstBuf := make([]byte, destinationBufferSize)
-		encoder, err := newWebpEncoder(decoder, dstBuf, false)
+		encoder, err := newWebpEncoder(decoder, dstBuf)
 		if err != nil {
 			t.Fatalf("Failed to create a new webp encoder: %v", err)
 		}