diff --git a/encoder.go b/encoder.go index 8dc921a..46872e2 100644 --- a/encoder.go +++ b/encoder.go @@ -30,8 +30,7 @@ func CreateEncoder() (*Encoder, error) { func (e *Encoder) Encode(image []byte, param *Param, paramImage *ParamImage) (data []byte, err error) { size := C.int(0) - result := C.encode(e.encoder, param.param, paramImage.param, (*C.uchar)(unsafe.Pointer(&image[0])), &size) - C.fflush(C.stdout) + result := C.gpuencode(e.encoder, param.param, paramImage.param, (*C.uchar)(unsafe.Pointer(&image[0])), &size) if size == C.int(0) { return nil, errors.New("Can't encode") } diff --git a/example/decode/decode.go b/example/decode/decode.go index fe3c9be..a114d6a 100644 --- a/example/decode/decode.go +++ b/example/decode/decode.go @@ -13,6 +13,7 @@ const file = "test.jpg" func main() { err := gpujpeg.InitDevice(0) + data, err := ioutil.ReadFile(file) if err != nil { fmt.Println(err) diff --git a/wrapper.c b/wrapper.c index 4a24378..ab2ddbe 100644 --- a/wrapper.c +++ b/wrapper.c @@ -14,7 +14,7 @@ gogpujpeg_encoder create_encoder() { return gpujpeg_encoder_create(0); } -uint8_t * encode(struct gpujpeg_encoder *encoder,gogpujpeg_parameters param, gogpujpeg_image_parameters param_image,uint8_t* data ,int *image_compressed_size) { +uint8_t * gpuencode(struct gpujpeg_encoder *encoder,gogpujpeg_parameters param, gogpujpeg_image_parameters param_image,uint8_t* data ,int *image_compressed_size) { uint8_t* image_compressed = NULL; gpujpeg_encoder_input encoder_input; gpujpeg_encoder_input_set_image(&encoder_input, data); diff --git a/wrapper.h b/wrapper.h index d7e7540..ab3f6ab 100644 --- a/wrapper.h +++ b/wrapper.h @@ -29,5 +29,5 @@ void free_gpujpeg_parameters(gogpujpeg_parameters p); gogpujpeg_image_parameters malloc_gpujpeg_image_parameters(); void free_gpujpeg_image_parameters(gogpujpeg_image_parameters p); -uint8_t * encode(struct gpujpeg_encoder *encoder,gogpujpeg_parameters param, gogpujpeg_image_parameters param_image,uint8_t* data ,int *image_compressed_size); +uint8_t * gpuencode(struct gpujpeg_encoder *encoder,gogpujpeg_parameters param, gogpujpeg_image_parameters param_image,uint8_t* data ,int *image_compressed_size); #endif /* WRAPPER_H */