head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.36
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.34
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.32
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.30
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.28
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.26
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.24
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.22
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.20
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.18
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.16
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.14
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.12
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.10
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.8
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.6
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.4
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.2
	pkgsrc-2021Q4-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2021.12.26.05.28.23;	author dholland;	state Exp;
branches;
next	;
commitid	UXuQlj10RTbeu7mD;


desc
@@


1.1
log
@graphics/camlimages: make it build again

Hasn't in a long time, so no PKGREVISION bump (it's at 96!)

It is fairly likely that these changes and/or OCaml internal changes
regarding immutable strings have changed the behavior if you abuse
internal interfaces or try to share graphics memory with the library
and scribble on it. Don't do that.

There are probably more data copies as well (meaning "slow") but I've
tried to avoid that as much as possible.
@
text
@$NetBSD$

Update for immutable strings.

--- src/image_intf.mli.orig	2011-06-22 18:04:32.000000000 +0000
+++ src/image_intf.mli
@@@@ -19,9 +19,9 @@@@ module type ENCODE =
   sig
     type t
     val bytes_per_pixel : int
-    val get : string -> int -> t
-    val set : string -> int -> t -> unit
-    val make : t -> string
+    val get : Bytes.t -> int -> t
+    val set : Bytes.t -> int -> t -> unit
+    val make : t -> Bytes.t
   end;;
 
 (** Low level image module type *)
@@@@ -33,15 +33,16 @@@@ module type RAWIMAGE = sig
   val width : t -> int
   val height : t -> int
   val dump : t -> string
+  val dumpbytes : t -> Bytes.t
   val create_with : int -> int -> string -> t
   val create_with_scanlines : int -> int -> string array -> t
   val create : int -> int -> t
   val make : int -> int -> elt -> t
-  val unsafe_access : t -> int -> int -> string * int
+  val unsafe_access : t -> int -> int -> Bytes.t * int
   val get_strip : t -> int -> int -> int -> string
   val set_strip : t -> int -> int -> int -> string -> unit
   val get_scanline : t -> int -> string
-  val get_scanline_ptr : t -> (int -> (string * int) * int) option
+  val get_scanline_ptr : t -> (int -> (Bytes.t * int) * int) option
   val set_scanline : t -> int -> string -> unit
   val unsafe_get : t -> int -> int -> elt
   val unsafe_set : t -> int -> int -> elt -> unit
@@@@ -126,11 +127,12 @@@@ module type IMAGE = sig
 
   (** functions for internal use *)
   val dump : t -> string
-  val unsafe_access : t -> int -> int -> string * int
+  val dumpbytes : t -> Bytes.t
+  val unsafe_access : t -> int -> int -> Bytes.t * int
   val get_strip : t -> int -> int -> int -> string
   val set_strip : t -> int -> int -> int -> string -> unit
   val get_scanline : t -> int -> string
-  val get_scanline_ptr : t -> (int -> (string * int) * int) option
+  val get_scanline_ptr : t -> (int -> (Bytes.t * int) * int) option
   val set_scanline : t -> int -> string -> unit
   val blocks : t -> int * int
   val dump_block : t -> int -> int -> Bitmap.Block.t
@