high-level api - add watermark

Signed-off-by: George Lemon <[email protected]>

Author: georgelemon

src/libvips/api.nim

@@ -70,6 +70,14 @@ proc format*(img: ptr VipsImage): VipsBandFormat =
   ## Get the pixel format of the image.
   vips_image_get_format(img)
 
+proc invert*(img: ptr VipsImage): ptr VipsImage =
+  ## Invert the colors of the image.
+  var res: ptr VipsImage
+  let rc = vips_invert(img, addr res)
+  if rc != 0:
+    raise newException(VipsError, "Failed to invert image")
+  res
+
 proc resize*(img: ptr VipsImage, scale: float): ptr VipsImage =
   ## Resize the image by the given scale factor.
   var res: ptr VipsImage

src/libvips/bindings/conversion.nim

@@ -169,131 +169,194 @@ proc c_vips_gamma(input: ptr VipsImage, output: ptr ptr VipsImage): cint {.impor
 # Safe wrappers
 proc vips_copy*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_copy(input, output, nil)
+  
 proc vips_tilecache*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_tilecache(input, output, nil)
+  
 proc vips_linecache*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_linecache(input, output, nil)
+  
 proc vips_sequential*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_sequential(input, output, nil)
+  
 proc vips_copy_file*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_copy_file(input, output, nil)
+  
 proc vips_embed*(input: ptr VipsImage, output: ptr ptr VipsImage, x, y, width, height: cint): cint =
   c_vips_embed(input, output, x, y, width, height, nil)
+  
 proc vips_gravity*(input: ptr VipsImage, output: ptr ptr VipsImage, direction: VipsCompassDirection, width, height: cint): cint =
   c_vips_gravity(input, output, direction, width, height, nil)
+  
 proc vips_flip*(input: ptr VipsImage, output: ptr ptr VipsImage, direction: VipsDirection): cint =
   c_vips_flip(input, output, direction, nil)
+  
 proc vips_insert*(main, sub: ptr VipsImage, output: ptr ptr VipsImage, x, y: cint): cint =
   c_vips_insert(main, sub, output, x, y, nil)
+  
 proc vips_join*(in1, in2: ptr VipsImage, output: ptr ptr VipsImage, direction: VipsDirection): cint =
   c_vips_join(in1, in2, output, direction, nil)
+  
 proc vips_arrayjoin*(input: ptr ptr VipsImage, output: ptr ptr VipsImage, n: cint): cint =
   c_vips_arrayjoin(input, output, n, nil)
+  
 proc vips_extract_area*(input: ptr VipsImage, output: ptr ptr VipsImage, left, top, width, height: cint): cint =
   c_vips_extract_area(input, output, left, top, width, height, nil)
+  
 proc vips_crop*(input: ptr VipsImage, output: ptr ptr VipsImage, left, top, width, height: cint): cint =
   c_vips_crop(input, output, left, top, width, height, nil)
+  
 proc vips_smartcrop*(input: ptr VipsImage, output: ptr ptr VipsImage, width, height: cint): cint =
   c_vips_smartcrop(input, output, width, height, nil)
+  
 proc vips_extract_band*(input: ptr VipsImage, output: ptr ptr VipsImage, band: cint): cint =
   c_vips_extract_band(input, output, band, nil)
+  
 proc vips_replicate*(input: ptr VipsImage, output: ptr ptr VipsImage, across, down: cint): cint =
   c_vips_replicate(input, output, across, down, nil)
+  
 proc vips_grid*(input: ptr VipsImage, output: ptr ptr VipsImage, tile_height, across, down: cint): cint =
   c_vips_grid(input, output, tile_height, across, down, nil)
+  
 proc vips_transpose3d*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_transpose3d(input, output, nil)
+  
 proc vips_wrap*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_wrap(input, output, nil)
+  
 proc vips_rot*(input: ptr VipsImage, output: ptr ptr VipsImage, angle: VipsAngle): cint =
   c_vips_rot(input, output, angle, nil)
+  
 proc vips_rot90*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_rot90(input, output, nil)
+  
 proc vips_rot180*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_rot180(input, output, nil)
+  
 proc vips_rot270*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_rot270(input, output, nil)
+  
 proc vips_rot45*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_rot45(input, output, nil)
+  
 proc vips_autorot_remove_angle*(image: ptr VipsImage) =
   c_vips_autorot_remove_angle(image)
 proc vips_autorot*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_autorot(input, output, nil)
+  
 proc vips_zoom*(input: ptr VipsImage, output: ptr ptr VipsImage, xfac, yfac: cint): cint =
   c_vips_zoom(input, output, xfac, yfac, nil)
+  
 proc vips_subsample*(input: ptr VipsImage, output: ptr ptr VipsImage, xfac, yfac: cint): cint =
   c_vips_subsample(input, output, xfac, yfac, nil)
+  
 proc vips_cast*(input: ptr VipsImage, output: ptr ptr VipsImage, format: VipsBandFormat): cint =
   c_vips_cast(input, output, format, nil)
+  
 proc vips_cast_uchar*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_uchar(input, output, nil)
+  
 proc vips_cast_char*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_char(input, output, nil)
+  
 proc vips_cast_ushort*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_ushort(input, output, nil)
+  
 proc vips_cast_short*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_short(input, output, nil)
+  
 proc vips_cast_uint*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_uint(input, output, nil)
+  
 proc vips_cast_int*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_int(input, output, nil)
+  
 proc vips_cast_float*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_float(input, output, nil)
+  
 proc vips_cast_double*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_double(input, output, nil)
+  
 proc vips_cast_complex*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_complex(input, output, nil)
+  
 proc vips_cast_dpcomplex*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_cast_dpcomplex(input, output, nil)
+  
 proc vips_scale*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_scale(input, output, nil)
+  
 proc vips_msb*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_msb(input, output, nil)
+  
 proc vips_byteswap*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_byteswap(input, output, nil)
+  
 proc vips_bandjoin*(input: ptr ptr VipsImage, output: ptr ptr VipsImage, n: cint): cint =
   c_vips_bandjoin(input, output, n, nil)
+  
 proc vips_bandjoin2*(in1, in2: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandjoin2(in1, in2, output, nil)
+  
 proc vips_bandjoin_const*(input: ptr VipsImage, output: ptr ptr VipsImage, c: ptr cdouble, n: cint): cint =
   c_vips_bandjoin_const(input, output, c, n, nil)
+  
 proc vips_bandjoin_const1*(input: ptr VipsImage, output: ptr ptr VipsImage, c: cdouble): cint =
   c_vips_bandjoin_const1(input, output, c, nil)
+  
 proc vips_bandrank*(input: ptr ptr VipsImage, output: ptr ptr VipsImage, n: cint): cint =
   c_vips_bandrank(input, output, n, nil)
+  
 proc vips_bandfold*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandfold(input, output, nil)
+  
 proc vips_bandunfold*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandunfold(input, output, nil)
+  
 proc vips_bandbool*(input: ptr VipsImage, output: ptr ptr VipsImage, boolean: VipsOperationBoolean): cint =
   c_vips_bandbool(input, output, boolean, nil)
+  
 proc vips_bandand*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandand(input, output, nil)
+  
 proc vips_bandor*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandor(input, output, nil)
+  
 proc vips_bandeor*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandeor(input, output, nil)
+  
 proc vips_bandmean*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_bandmean(input, output, nil)
+  
 proc vips_recomb*(input: ptr VipsImage, output: ptr ptr VipsImage, m: ptr VipsImage): cint =
   c_vips_recomb(input, output, m, nil)
+  
 proc vips_ifthenelse*(cond, in1, in2: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_ifthenelse(cond, in1, in2, output, nil)
+  
 proc vips_switch*(tests: ptr ptr VipsImage, output: ptr ptr VipsImage, n: cint): cint =
   c_vips_switch(tests, output, n, nil)
+  
 proc vips_flatten*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_flatten(input, output, nil)
+  
 proc vips_addalpha*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_addalpha(input, output, nil)
+  
 proc vips_premultiply*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_premultiply(input, output, nil)
+  
 proc vips_unpremultiply*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_unpremultiply(input, output, nil)
+  
 proc vips_composite*(input: ptr ptr VipsImage, output: ptr ptr VipsImage, n: cint, mode: ptr cint): cint =
   c_vips_composite(input, output, n, mode, nil)
+  
 proc vips_composite2*(base, overlay: ptr VipsImage, output: ptr ptr VipsImage, mode: VipsBlendMode): cint =
   c_vips_composite2(base, overlay, output, mode, nil)
+  
 proc vips_falsecolour*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
   c_vips_falsecolour(input, output, nil)
+  
 proc vips_gamma*(input: ptr VipsImage, output: ptr ptr VipsImage): cint =
-  c_vips_gamma(input, output, nil)
+  c_vips_gamma(input, output, nil)

src/libvips/bindings/image.nim

@@ -96,12 +96,12 @@ type
 # Raw varargs imports
 proc c_vips_image_new_from_file(name: cstring): ptr VipsImage {.cdecl, importc: "vips_image_new_from_file", varargs.}
 proc c_vips_image_write_to_file(img: ptr VipsImage, fname: cstring): cint {.cdecl, importc: "vips_image_write_to_file", varargs.}
-proc c_vips_image_new_from_buffer(buf: pointer, len: csize_t, option_string: cstring, args: varargs[pointer]): ptr VipsImage {.cdecl, importc: "vips_image_new_from_buffer", varargs.}
-proc c_vips_image_new_from_source(source: ptr VipsSource, option_string: cstring, args: varargs[pointer]): ptr VipsImage {.cdecl, importc: "vips_image_new_from_source", varargs.}
-proc c_vips_image_write_to_buffer(img: ptr VipsImage, suffix: cstring, buf: ptr pointer, size: ptr csize_t, args: varargs[pointer]): cint {.cdecl, importc: "vips_image_write_to_buffer", varargs.}
-proc c_vips_image_write_to_target(img: ptr VipsImage, suffix: cstring, target: ptr VipsTarget, args: varargs[pointer]): cint {.cdecl, importc: "vips_image_write_to_target", varargs.}
-proc c_vips_system(cmd_format: cstring, args: varargs[pointer]): cint {.cdecl, importc: "vips_system", varargs.}
-proc c_vips_array_image_newv(n: cint, args: varargs[pointer]): ptr VipsArrayImage {.cdecl, importc: "vips_array_image_newv", varargs.}
+proc c_vips_image_new_from_buffer(buf: pointer, len: csize_t, option_string: cstring): ptr VipsImage {.cdecl, importc: "vips_image_new_from_buffer", varargs.}
+proc c_vips_image_new_from_source(source: ptr VipsSource, option_string: cstring): ptr VipsImage {.cdecl, importc: "vips_image_new_from_source", varargs.}
+proc c_vips_image_write_to_buffer(img: ptr VipsImage, suffix: cstring, buf: ptr pointer, size: ptr csize_t): cint {.cdecl, importc: "vips_image_write_to_buffer", varargs.}
+proc c_vips_image_write_to_target(img: ptr VipsImage, suffix: cstring, target: ptr VipsTarget): cint {.cdecl, importc: "vips_image_write_to_target", varargs.}
+proc c_vips_system(cmd_format: cstring): cint {.cdecl, importc: "vips_system", varargs.}
+proc c_vips_array_image_newv(n: cint): ptr VipsArrayImage {.cdecl, importc: "vips_array_image_newv", varargs.}
 
 # Safe, exported wrappers
 proc vips_image_new_from_file*(fname: cstring): ptr VipsImage =
@@ -128,7 +128,7 @@ proc vips_system*(cmd_format: cstring): cint =
 proc vips_array_image_newv*(n: cint): ptr VipsArrayImage =
   c_vips_array_image_newv(n, nil)
 
-{.push cdecl, importc, header: "vips/image.h".}
+{.push cdecl, importc, header: "vips/vips.h".} # should be `vips/header.h` but the compiler complains about missing types
 proc vips_image_get_type*(): culong
 proc vips_progress_set*(progress: gboolean)
 proc vips_image_invalidate_all*(image: ptr VipsImage)
@@ -146,8 +146,6 @@ proc vips_image_new_from_file_RW*(filename: cstring): ptr VipsImage
 proc vips_image_new_from_file_raw*(filename: cstring, xsize, ysize, bands: cint, offset: guint64): ptr VipsImage
 proc vips_image_new_from_memory*(data: pointer, size: csize_t, width, height, bands: cint, format: VipsBandFormat): ptr VipsImage
 proc vips_image_new_from_memory_copy*(data: pointer, size: csize_t, width, height, bands: cint, format: VipsBandFormat): ptr VipsImage
-proc vips_image_new_from_buffer*(buf: pointer, len: csize_t, option_string: cstring, args: varargs[pointer]): ptr VipsImage
-proc vips_image_new_from_source*(source: ptr VipsSource, option_string: cstring, args: varargs[pointer]): ptr VipsImage
 proc vips_image_new_matrix*(width, height: cint): ptr VipsImage
 proc vips_image_new_matrixv*(width, height: cint, args: varargs[cdouble]): ptr VipsImage
 proc vips_image_new_matrix_from_array*(width, height: cint, array: ptr cdouble, size: cint): ptr VipsImage
@@ -158,8 +156,6 @@ proc vips_image_set_delete_on_close*(image: ptr VipsImage, delete_on_close: gboo
 proc vips_get_disc_threshold*(): guint64
 proc vips_image_new_temp_file*(format: cstring): ptr VipsImage
 proc vips_image_write*(image: ptr VipsImage, outImg: ptr VipsImage): cint
-proc vips_image_write_to_buffer*(img: ptr VipsImage, suffix: cstring, buf: ptr pointer, size: ptr csize_t, args: varargs[pointer]): cint
-proc vips_image_write_to_target*(img: ptr VipsImage, suffix: cstring, target: ptr VipsTarget, args: varargs[pointer]): cint
 proc vips_image_write_to_memory*(img: ptr VipsImage, size: ptr csize_t): pointer
 proc vips_image_decode_predict*(img: ptr VipsImage, bands: ptr cint, format: ptr VipsBandFormat): cint
 proc vips_image_decode*(img: ptr VipsImage, outImg: ptr ptr VipsImage): cint
@@ -180,9 +176,7 @@ proc vips_band_format_isuint*(format: VipsBandFormat): gboolean
 proc vips_band_format_is8bit*(format: VipsBandFormat): gboolean
 proc vips_band_format_isfloat*(format: VipsBandFormat): gboolean
 proc vips_band_format_iscomplex*(format: VipsBandFormat): gboolean
-proc vips_system*(cmd_format: cstring, args: varargs[pointer]): cint
 proc vips_array_image_new*(array: ptr ptr VipsImage, n: cint): ptr VipsArrayImage
-proc vips_array_image_newv*(n: cint, args: varargs[pointer]): ptr VipsArrayImage
 proc vips_array_image_new_from_string*(str: cstring, flags: VipsAccess): ptr VipsArrayImage
 proc vips_array_image_empty*(): ptr VipsArrayImage
 proc vips_array_image_append*(array: ptr VipsArrayImage, image: ptr VipsImage): ptr VipsArrayImage