Changed pixmap loader to use stb-image hdr support and tidied up PixelFormat enum.

modules/std/graphics/pixelformat.monkey2

@@ -25,16 +25,22 @@ Enum PixelFormat
 	RGB8
 	RGBA8
 
+	I16F
+	A16F
+	IA16F
+	RGB16F
 	RGBA16F
+	
+	I32F
+	A32F
+	IA32F
+	RGB32F
 	RGBA32F
 	
 	Depth16
 	Depth24
 	Depth32
 	
-	RGB16F
-	RGB32F
-	
 	RGBE8
 	
 	'deprecated
@@ -46,23 +52,19 @@ End
 
 Function IsAlphaPixelFormat:Bool( format:PixelFormat )
 	Select format
-	Case PixelFormat.A8,PixelFormat.IA8,PixelFormat.RGBA8,PixelFormat.RGBA16F,PixelFormat.RGBA32F Return True
+	Case PixelFormat.A8,PixelFormat.IA8,PixelFormat.RGBA8 Return True
+	Case PixelFormat.A16F,PixelFormat.IA16F,PixelFormat.RGBA16F Return True
+	Case PixelFormat.A32F,PixelFormat.IA32F,PixelFormat.RGBA32F Return True
 	End
 	Return False
 End
 
 Function IsDepthPixelFormat:Bool( format:PixelFormat )
-	Select format
-	Case PixelFormat.Depth16,PixelFormat.Depth24,PixelFormat.Depth32 Return True
-	End
-	Return False
+	Return Int( format )>=Int( PixelFormat.Depth16 ) And Int( format )<=Int( PixelFormat.Depth32 )
 End
 
 Function IsFloatPixelFormat:Bool( format:PixelFormat )
-	Select format
-	Case PixelFormat.RGBA16F,PixelFormat.RGBA32F,PixelFormat.RGB16F,PixelFormat.RGB32F Return True
-	End
-	Return False
+	Return Int( format )>=Int( PixelFormat.I16F ) And Int( format )<=Int( PixelFormat.RGBA32F )
 End
 
 #rem monkeydoc Gets the number of bytes per pixel for a particular pixel format.
@@ -70,25 +72,31 @@ End
 Function PixelFormatDepth:Int( format:PixelFormat )
 
 	Select format
+		
 	Case PixelFormat.I8 Return 1
 	Case PixelFormat.A8 Return 1
 	Case PixelFormat.IA8 Return 2
 	Case PixelFormat.RGB8 Return 3
 	Case PixelFormat.RGBA8 Return 4
+		
+	Case PixelFormat.I16F Return 2
+	Case PixelFormat.A16F Return 2
+	Case PixelFormat.IA16F Return 4
+	Case PixelFormat.RGB16F Return 6
 	Case PixelFormat.RGBA16F Return 8
+		
+	Case PixelFormat.I32F Return 4
+	Case PixelFormat.A32F Return 4
+	Case PixelFormat.IA32F Return 8
+	Case PixelFormat.RGB32F Return 12
 	Case PixelFormat.RGBA32F Return 16
+
 	Case PixelFormat.Depth16 Return 2
 	Case PixelFormat.Depth24 Return 4
 	Case PixelFormat.Depth32 Return 4
-	Case PixelFormat.RGB16F Return 6
-	Case PixelFormat.RGB32F Return 12
+
 	Case PixelFormat.RGBE8 Return 4
 		
-	'deprecated
-	Case PixelFormat.IA16 Return 2
-	Case PixelFormat.RGB24 Return 3
-	Case PixelFormat.RGBA32 Return 4
-		
 	End
 	
 	Return 0

modules/std/graphics/pixmaploader.monkey2

@@ -1,21 +1,10 @@
 
 Namespace std.graphics.pixmaploader
 
-#Import "rgbe/rgbe.c"
-#Import "rgbe/rgbe.h"
-
 Using stb.image
 Using std.stream
 
-Extern Private
-
-Struct rgbe_header_info
-End
-
-Function RGBE_ReadHeader:Int( fp:FILE Ptr,width:Int Ptr,height:Int Ptr,info:rgbe_header_info Ptr )
-Function RGBE_ReadPixels_RLE:Int( fp:FILE Ptr,data:Float Ptr,scanline_width:Int,num_scanlines:Int )
-
-Private
+Internal
 
 Struct stbi_user
 	Field stream:Stream
@@ -36,8 +25,6 @@ Function stbi_eof:Int( user:Void Ptr )
 	Return stream.Eof
 End
 
-#rem monkeydoc @hidden
-#end
 Class StbPixmap Extends Pixmap
 	
 	Method New( width:Int,height:Int,format:PixelFormat,data:UByte Ptr,pitch:Int )
@@ -52,10 +39,12 @@ Class StbPixmap Extends Pixmap
 	
 	Method OnDiscard() Override
 		
-		Super.OnDiscard()
+		If Not _data Return
 		
 		stbi_image_free( _data )
 		
+		Super.OnDiscard()
+		
 		_data=Null
 	End
 	
@@ -65,7 +54,83 @@ Class StbPixmap Extends Pixmap
 	End
 End
 
-Public
+Function LoadPixmap:Pixmap( path:String,format:PixelFormat )
+	
+	Local stream:=Stream.Open( path,"r" )
+	If Not stream Return Null
+
+	Local user:stbi_user
+	user.stream=stream
+	
+	Local clbks:stbi_io_callbacks
+	clbks.read=stbi_read
+	clbks.skip=stbi_skip
+	clbks.eof=stbi_eof
+
+	Local req_comp:Int,isfloat:Bool
+	
+	Select format
+	Case PixelFormat.RGB32F
+		isfloat=True
+		req_comp=3
+	Case PixelFormat.RGBA32F
+		isfloat=True
+		req_comp=4
+	Case PixelFormat.IA8,PixelFormat.RGB8,PixelFormat.RGBA8
+		isfloat=False
+		req_comp=PixelFormatDepth( format )
+	Case PixelFormat.Unknown
+		Local pos:=stream.Position
+		isfloat=stbi_is_hdr_from_callbacks( Varptr clbks,Varptr user )
+		stream.Seek( pos )
+		req_comp=0
+	Default
+		stream.Close()
+		Return Null
+	End
+	
+	Local x:Int,y:Int,comp:Int,data:UByte Ptr
+	
+	If isfloat
+		
+		stbi_ldr_to_hdr_gamma( 1.0 )
+		stbi_hdr_to_ldr_gamma( 1.0 )
+		
+		data=Cast<UByte Ptr>( stbi_loadf_from_callbacks( Varptr clbks,Varptr user,Varptr x,Varptr y,Varptr comp,req_comp ) )
+		
+		Select comp
+		Case 1 format=PixelFormat.I32F
+		Case 2 format=PixelFormat.IA32F
+		Case 3 format=PixelFormat.RGB32F
+		Case 4 format=PixelFormat.RGBA32F
+		Default format=PixelFormat.Unknown
+		End
+	Else
+		
+		data=stbi_load_from_callbacks( Varptr clbks,Varptr user,Varptr x,Varptr y,Varptr comp,0 )
+		
+		Select comp
+		Case 1 format=PixelFormat.I8
+		Case 2 format=PixelFormat.IA8
+		Case 3 format=PixelFormat.RGB8
+		Case 4 format=PixelFormat.RGBA8
+		Default format=PixelFormat.Unknown
+		End
+	Endif
+	
+	stream.Close()
+	
+	If format=PixelFormat.Unknown
+		Print "Unknown format for image at '"+path+"'"
+		Return Null
+	endif
+	
+	Local pixmap:=New StbPixmap( x,y,format,data,x*PixelFormatDepth( format ) )
+	
+	Return pixmap
+End
+
+#rem
 
 #rem monkeydoc @hidden
 #end
@@ -130,3 +195,5 @@ Function LoadPixmap:Pixmap( path:String,format:PixelFormat )
 	
 	Return pixmap
 End
+
+#End

modules/std/graphics/rgbe/rgbe.c

@@ -1,413 +0,0 @@
-/* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE.
- * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY,
- * IT IS STRICTLY USE AT YOUR OWN RISK.  */
-
-#include "rgbe.h"
-#include <math.h>
-#include <stdlib.h>	//<malloc.h>
-#include <string.h>
-#include <ctype.h>
-
-/* This file contains code to read and write four byte rgbe file format
- developed by Greg Ward.  It handles the conversions between rgbe and
- pixels consisting of floats.  The data is assumed to be an array of floats.
- By default there are three floats per pixel in the order red, green, blue.
- (RGBE_DATA_??? values control this.)  Only the mimimal header reading and 
- writing is implemented.  Each routine does error checking and will return
- a status value as defined below.  This code is intended as a skeleton so
- feel free to modify it to suit your needs.
-
- (Place notice here if you modified the code.)
- posted to http://www.graphics.cornell.edu/~bjw/
- written by Bruce Walter  ([email protected])  5/26/95
- based on code written by Greg Ward
-*/
-
-#ifdef _CPLUSPLUS
-/* define if your compiler understands inline commands */
-#define INLINE inline
-#else
-#define INLINE
-#endif
-
-/* offsets to red, green, and blue components in a data (float) pixel */
-#define RGBE_DATA_RED    0
-#define RGBE_DATA_GREEN  1
-#define RGBE_DATA_BLUE   2
-/* number of floats per pixel */
-#define RGBE_DATA_SIZE   3
-
-enum rgbe_error_codes {
-  rgbe_read_error,
-  rgbe_write_error,
-  rgbe_format_error,
-  rgbe_memory_error,
-};
-
-/* default error routine.  change this to change error handling */
-static int rgbe_error(int rgbe_error_code, char *msg)
-{
-  switch (rgbe_error_code) {
-  case rgbe_read_error:
-    perror("RGBE read error");
-    break;
-  case rgbe_write_error:
-    perror("RGBE write error");
-    break;
-  case rgbe_format_error:
-    fprintf(stderr,"RGBE bad file format: %s\n",msg);
-    break;
-  default:
-  case rgbe_memory_error:
-    fprintf(stderr,"RGBE error: %s\n",msg);
-  }
-  return RGBE_RETURN_FAILURE;
-}
-
-/* standard conversion from float pixels to rgbe pixels */
-/* note: you can remove the "inline"s if your compiler complains about it */
-static INLINE void 
-float2rgbe(unsigned char rgbe[4], float red, float green, float blue)
-{
-  float v;
-  int e;
-
-  v = red;
-  if (green > v) v = green;
-  if (blue > v) v = blue;
-  if (v < 1e-32) {
-    rgbe[0] = rgbe[1] = rgbe[2] = rgbe[3] = 0;
-  }
-  else {
-    v = frexp(v,&e) * 256.0/v;
-    rgbe[0] = (unsigned char) (red * v);
-    rgbe[1] = (unsigned char) (green * v);
-    rgbe[2] = (unsigned char) (blue * v);
-    rgbe[3] = (unsigned char) (e + 128);
-  }
-}
-
-/* standard conversion from rgbe to float pixels */
-/* note: Ward uses ldexp(col+0.5,exp-(128+8)).  However we wanted pixels */
-/*       in the range [0,1] to map back into the range [0,1].            */
-static INLINE void 
-rgbe2float(float *red, float *green, float *blue, unsigned char rgbe[4])
-{
-  float f;
-
-  if (rgbe[3]) {   /*nonzero pixel*/
-    f = ldexp(1.0,rgbe[3]-(int)(128+8));
-    *red = rgbe[0] * f;
-    *green = rgbe[1] * f;
-    *blue = rgbe[2] * f;
-  }
-  else
-    *red = *green = *blue = 0.0;
-}
-
-/* default minimal header. modify if you want more information in header */
-int RGBE_WriteHeader(FILE *fp, int width, int height, rgbe_header_info *info)
-{
-  char *programtype = "RGBE";
-
-  if (info && (info->valid & RGBE_VALID_PROGRAMTYPE))
-    programtype = info->programtype;
-  if (fprintf(fp,"#?%s\n",programtype) < 0)
-    return rgbe_error(rgbe_write_error,NULL);
-  /* The #? is to identify file type, the programtype is optional. */
-  if (info && (info->valid & RGBE_VALID_GAMMA)) {
-    if (fprintf(fp,"GAMMA=%g\n",info->gamma) < 0)
-      return rgbe_error(rgbe_write_error,NULL);
-  }
-  if (info && (info->valid & RGBE_VALID_EXPOSURE)) {
-    if (fprintf(fp,"EXPOSURE=%g\n",info->exposure) < 0)
-      return rgbe_error(rgbe_write_error,NULL);
-  }
-  if (fprintf(fp,"FORMAT=32-bit_rle_rgbe\n\n") < 0)
-    return rgbe_error(rgbe_write_error,NULL);
-  if (fprintf(fp, "-Y %d +X %d\n", height, width) < 0)
-    return rgbe_error(rgbe_write_error,NULL);
-  return RGBE_RETURN_SUCCESS;
-}
-
-/* minimal header reading.  modify if you want to parse more information */
-int RGBE_ReadHeader(FILE *fp, int *width, int *height, rgbe_header_info *info)
-{
-  char buf[128];
-  int found_format;
-  float tempf;
-  int i;
-
-  found_format = 0;
-  if (info) {
-    info->valid = 0;
-    info->programtype[0] = 0;
-    info->gamma = info->exposure = 1.0;
-  }
-  if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == NULL)
-    return rgbe_error(rgbe_read_error,NULL);
-  if ((buf[0] != '#')||(buf[1] != '?')) {
-    /* if you want to require the magic token then uncomment the next line */
-    /*return rgbe_error(rgbe_format_error,"bad initial token"); */
-  }
-  else if (info) {
-    info->valid |= RGBE_VALID_PROGRAMTYPE;
-    for(i=0;i<sizeof(info->programtype)-1;i++) {
-      if ((buf[i+2] == 0) || isspace(buf[i+2]))
-	break;
-      info->programtype[i] = buf[i+2];
-    }
-    info->programtype[i] = 0;
-    if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
-      return rgbe_error(rgbe_read_error,NULL);
-  }
-  for(;;) {
-    if ((buf[0] == 0)||(buf[0] == '\n'))
-      return rgbe_error(rgbe_format_error,"no FORMAT specifier found");
-    else if (strcmp(buf,"FORMAT=32-bit_rle_rgbe\n") == 0)
-      break;       /* format found so break out of loop */
-    else if (info && (sscanf(buf,"GAMMA=%g",&tempf) == 1)) {
-      info->gamma = tempf;
-      info->valid |= RGBE_VALID_GAMMA;
-    }
-    else if (info && (sscanf(buf,"EXPOSURE=%g",&tempf) == 1)) {
-      info->exposure = tempf;
-      info->valid |= RGBE_VALID_EXPOSURE;
-    }
-    if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
-      return rgbe_error(rgbe_read_error,NULL);
-  }
-  if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
-    return rgbe_error(rgbe_read_error,NULL);
-  if (strcmp(buf,"\n") != 0)
-    return rgbe_error(rgbe_format_error,
-		      "missing blank line after FORMAT specifier");
-  if (fgets(buf,sizeof(buf)/sizeof(buf[0]),fp) == 0)
-    return rgbe_error(rgbe_read_error,NULL);
-  if (sscanf(buf,"-Y %d +X %d",height,width) < 2)
-    return rgbe_error(rgbe_format_error,"missing image size specifier");
-  return RGBE_RETURN_SUCCESS;
-}
-
-/* simple write routine that does not use run length encoding */
-/* These routines can be made faster by allocating a larger buffer and
-   fread-ing and fwrite-ing the data in larger chunks */
-int RGBE_WritePixels(FILE *fp, float *data, int numpixels)
-{
-  unsigned char rgbe[4];
-
-  while (numpixels-- > 0) {
-    float2rgbe(rgbe,data[RGBE_DATA_RED],
-	       data[RGBE_DATA_GREEN],data[RGBE_DATA_BLUE]);
-    data += RGBE_DATA_SIZE;
-    if (fwrite(rgbe, sizeof(rgbe), 1, fp) < 1)
-      return rgbe_error(rgbe_write_error,NULL);
-  }
-  return RGBE_RETURN_SUCCESS;
-}
-
-/* simple read routine.  will not correctly handle run length encoding */
-int RGBE_ReadPixels(FILE *fp, float *data, int numpixels)
-{
-  unsigned char rgbe[4];
-
-  while(numpixels-- > 0) {
-    if (fread(rgbe, sizeof(rgbe), 1, fp) < 1)
-      return rgbe_error(rgbe_read_error,NULL);
-    rgbe2float(&data[RGBE_DATA_RED],&data[RGBE_DATA_GREEN],
-	       &data[RGBE_DATA_BLUE],rgbe);
-    data += RGBE_DATA_SIZE;
-  }
-  return RGBE_RETURN_SUCCESS;
-}
-
-/* The code below is only needed for the run-length encoded files. */
-/* Run length encoding adds considerable complexity but does */
-/* save some space.  For each scanline, each channel (r,g,b,e) is */
-/* encoded separately for better compression. */
-
-static int RGBE_WriteBytes_RLE(FILE *fp, unsigned char *data, int numbytes)
-{
-#define MINRUNLENGTH 4
-  int cur, beg_run, run_count, old_run_count, nonrun_count;
-  unsigned char buf[2];
-
-  cur = 0;
-  while(cur < numbytes) {
-    beg_run = cur;
-    /* find next run of length at least 4 if one exists */
-    run_count = old_run_count = 0;
-    while((run_count < MINRUNLENGTH) && (beg_run < numbytes)) {
-      beg_run += run_count;
-      old_run_count = run_count;
-      run_count = 1;
-      while( (beg_run + run_count < numbytes) && (run_count < 127)
-             && (data[beg_run] == data[beg_run + run_count]))
-	run_count++;
-    }
-    /* if data before next big run is a short run then write it as such */
-    if ((old_run_count > 1)&&(old_run_count == beg_run - cur)) {
-      buf[0] = 128 + old_run_count;   /*write short run*/
-      buf[1] = data[cur];
-      if (fwrite(buf,sizeof(buf[0])*2,1,fp) < 1)
-	return rgbe_error(rgbe_write_error,NULL);
-      cur = beg_run;
-    }
-    /* write out bytes until we reach the start of the next run */
-    while(cur < beg_run) {
-      nonrun_count = beg_run - cur;
-      if (nonrun_count > 128) 
-	nonrun_count = 128;
-      buf[0] = nonrun_count;
-      if (fwrite(buf,sizeof(buf[0]),1,fp) < 1)
-	return rgbe_error(rgbe_write_error,NULL);
-      if (fwrite(&data[cur],sizeof(data[0])*nonrun_count,1,fp) < 1)
-	return rgbe_error(rgbe_write_error,NULL);
-      cur += nonrun_count;
-    }
-    /* write out next run if one was found */
-    if (run_count >= MINRUNLENGTH) {
-      buf[0] = 128 + run_count;
-      buf[1] = data[beg_run];
-      if (fwrite(buf,sizeof(buf[0])*2,1,fp) < 1)
-	return rgbe_error(rgbe_write_error,NULL);
-      cur += run_count;
-    }
-  }
-  return RGBE_RETURN_SUCCESS;
-#undef MINRUNLENGTH
-}
-
-int RGBE_WritePixels_RLE(FILE *fp, float *data, int scanline_width,
-			 int num_scanlines)
-{
-  unsigned char rgbe[4];
-  unsigned char *buffer;
-  int i, err;
-
-  if ((scanline_width < 8)||(scanline_width > 0x7fff))
-    /* run length encoding is not allowed so write flat*/
-    return RGBE_WritePixels(fp,data,scanline_width*num_scanlines);
-  buffer = (unsigned char *)malloc(sizeof(unsigned char)*4*scanline_width);
-  if (buffer == NULL) 
-    /* no buffer space so write flat */
-    return RGBE_WritePixels(fp,data,scanline_width*num_scanlines);
-  while(num_scanlines-- > 0) {
-    rgbe[0] = 2;
-    rgbe[1] = 2;
-    rgbe[2] = scanline_width >> 8;
-    rgbe[3] = scanline_width & 0xFF;
-    if (fwrite(rgbe, sizeof(rgbe), 1, fp) < 1) {
-      free(buffer);
-      return rgbe_error(rgbe_write_error,NULL);
-    }
-    for(i=0;i<scanline_width;i++) {
-      float2rgbe(rgbe,data[RGBE_DATA_RED],
-		 data[RGBE_DATA_GREEN],data[RGBE_DATA_BLUE]);
-      buffer[i] = rgbe[0];
-      buffer[i+scanline_width] = rgbe[1];
-      buffer[i+2*scanline_width] = rgbe[2];
-      buffer[i+3*scanline_width] = rgbe[3];
-      data += RGBE_DATA_SIZE;
-    }
-    /* write out each of the four channels separately run length encoded */
-    /* first red, then green, then blue, then exponent */
-    for(i=0;i<4;i++) {
-      if ((err = RGBE_WriteBytes_RLE(fp,&buffer[i*scanline_width],
-				     scanline_width)) != RGBE_RETURN_SUCCESS) {
-	free(buffer);
-	return err;
-      }
-    }
-  }
-  free(buffer);
-  return RGBE_RETURN_SUCCESS;
-}
-      
-int RGBE_ReadPixels_RLE(FILE *fp, float *data, int scanline_width,
-			int num_scanlines)
-{
-  unsigned char rgbe[4], *scanline_buffer, *ptr, *ptr_end;
-  int i, count;
-  unsigned char buf[2];
-
-  if ((scanline_width < 8)||(scanline_width > 0x7fff))
-    /* run length encoding is not allowed so read flat*/
-    return RGBE_ReadPixels(fp,data,scanline_width*num_scanlines);
-  scanline_buffer = NULL;
-  /* read in each successive scanline */
-  while(num_scanlines > 0) {
-    if (fread(rgbe,sizeof(rgbe),1,fp) < 1) {
-      free(scanline_buffer);
-      return rgbe_error(rgbe_read_error,NULL);
-    }
-    if ((rgbe[0] != 2)||(rgbe[1] != 2)||(rgbe[2] & 0x80)) {
-      /* this file is not run length encoded */
-      rgbe2float(&data[0],&data[1],&data[2],rgbe);
-      data += RGBE_DATA_SIZE;
-      free(scanline_buffer);
-      return RGBE_ReadPixels(fp,data,scanline_width*num_scanlines-1);
-    }
-    if ((((int)rgbe[2])<<8 | rgbe[3]) != scanline_width) {
-      free(scanline_buffer);
-      return rgbe_error(rgbe_format_error,"wrong scanline width");
-    }
-    if (scanline_buffer == NULL)
-      scanline_buffer = (unsigned char *)
-	malloc(sizeof(unsigned char)*4*scanline_width);
-    if (scanline_buffer == NULL) 
-      return rgbe_error(rgbe_memory_error,"unable to allocate buffer space");
-    
-    ptr = &scanline_buffer[0];
-    /* read each of the four channels for the scanline into the buffer */
-    for(i=0;i<4;i++) {
-      ptr_end = &scanline_buffer[(i+1)*scanline_width];
-      while(ptr < ptr_end) {
-	if (fread(buf,sizeof(buf[0])*2,1,fp) < 1) {
-	  free(scanline_buffer);
-	  return rgbe_error(rgbe_read_error,NULL);
-	}
-	if (buf[0] > 128) {
-	  /* a run of the same value */
-	  count = buf[0]-128;
-	  if ((count == 0)||(count > ptr_end - ptr)) {
-	    free(scanline_buffer);
-	    return rgbe_error(rgbe_format_error,"bad scanline data");
-	  }
-	  while(count-- > 0)
-	    *ptr++ = buf[1];
-	}
-	else {
-	  /* a non-run */
-	  count = buf[0];
-	  if ((count == 0)||(count > ptr_end - ptr)) {
-	    free(scanline_buffer);
-	    return rgbe_error(rgbe_format_error,"bad scanline data");
-	  }
-	  *ptr++ = buf[1];
-	  if (--count > 0) {
-	    if (fread(ptr,sizeof(*ptr)*count,1,fp) < 1) {
-	      free(scanline_buffer);
-	      return rgbe_error(rgbe_read_error,NULL);
-	    }
-	    ptr += count;
-	  }
-	}
-      }
-    }
-    /* now convert data from buffer into floats */
-    for(i=0;i<scanline_width;i++) {
-      rgbe[0] = scanline_buffer[i];
-      rgbe[1] = scanline_buffer[i+scanline_width];
-      rgbe[2] = scanline_buffer[i+2*scanline_width];
-      rgbe[3] = scanline_buffer[i+3*scanline_width];
-      rgbe2float(&data[RGBE_DATA_RED],&data[RGBE_DATA_GREEN],
-		 &data[RGBE_DATA_BLUE],rgbe);
-      data += RGBE_DATA_SIZE;
-    }
-    num_scanlines--;
-  }
-  free(scanline_buffer);
-  return RGBE_RETURN_SUCCESS;
-}
-

modules/std/graphics/rgbe/rgbe.h

@@ -1,61 +0,0 @@
-#ifndef _H_RGBE
-#define _H_RGBE
-/* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE.
- * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY,
- * IT IS STRICTLY USE AT YOUR OWN RISK.  */
-
-/* utility for reading and writing Ward's rgbe image format.
-   See rgbe.txt file for more details.
-*/
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-typedef struct {
-  int valid;            /* indicate which fields are valid */
-  char programtype[16]; /* listed at beginning of file to identify it 
-                         * after "#?".  defaults to "RGBE" */ 
-  float gamma;          /* image has already been gamma corrected with 
-                         * given gamma.  defaults to 1.0 (no correction) */
-  float exposure;       /* a value of 1.0 in an image corresponds to
-			 * <exposure> watts/steradian/m^2. 
-			 * defaults to 1.0 */
-} rgbe_header_info;
-
-/* flags indicating which fields in an rgbe_header_info are valid */
-#define RGBE_VALID_PROGRAMTYPE 0x01
-#define RGBE_VALID_GAMMA       0x02
-#define RGBE_VALID_EXPOSURE    0x04
-
-/* return codes for rgbe routines */
-#define RGBE_RETURN_SUCCESS 0
-#define RGBE_RETURN_FAILURE -1
-
-/* read or write headers */
-/* you may set rgbe_header_info to null if you want to */
-int RGBE_WriteHeader(FILE *fp, int width, int height, rgbe_header_info *info);
-int RGBE_ReadHeader(FILE *fp, int *width, int *height, rgbe_header_info *info);
-
-/* read or write pixels */
-/* can read or write pixels in chunks of any size including single pixels*/
-int RGBE_WritePixels(FILE *fp, float *data, int numpixels);
-int RGBE_ReadPixels(FILE *fp, float *data, int numpixels);
-
-/* read or write run length encoded files */
-/* must be called to read or write whole scanlines */
-int RGBE_WritePixels_RLE(FILE *fp, float *data, int scanline_width,
-			 int num_scanlines);
-int RGBE_ReadPixels_RLE(FILE *fp, float *data, int scanline_width,
-			int num_scanlines);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _H_RGBE */
-
-
-

modules/std/graphics/rgbe/rgbe.txt

@@ -1,61 +0,0 @@
-<HTML>
-The rgbe image file format was invented by Greg Ward to reduce the precision
-problems inherent in normal 24bit file formats.  Many programs including
-photorealistic renderers produce pixels with a wide range of values.  
-Internally the programs usually handle this by representing colors by
-floating point values.  However writing out the floating point values
-directly would produce very large files (~96 bits/pixel).  The rgbe format
-works by having all channels (typically red, green, and blue) share a single
-exponent.  Thus a pixel consists of three 8 bit mantissas and an 8 bit
-exponent for 32 bits per pixel.  This makes for a compact format which
-can handle wide range of pixels values (from 0 to 2^127) with reasonable
-precision.  See "Real Pixels" by Greg Ward in Graphics Gems II for more
-details.
-
-This code was written based on Greg Ward's code (available from the
-radiance home page ftp://radsite.lbl.gov/home.html) for reading and
-writing rgbe files.  I have rewritten the code as ANSI C and tried to
-clean up the code and comment it to make it easier to understand.  I've
-also tried to make the error detection a little more robust.  Here's the
-minimal code for using these files.
-
-sample minimal writing code:
-  f = fopen(image_filename,"wb");
-  RGBE_WriteHeader(f,image_width,image_height,NULL);
-  RGBE_WritePixels(f,image,image_width*image_height);
-  fclose(f);
-For run length encoding instead of RGBE_WritePixels, use 
-RGBE_WritePixels_RLE(f,image,image_width,image_height).
-
-sample minimal reading code:
-  f = fopen(image_filename,"rb");
-  RGBE_ReadHeader(f,&image_width,&image_height,NULL);
-  image = (float *)malloc(sizeof(float)*3*image_width*image_height);
-  RGBE_ReadPixels_RLE(f,image,image_width,image_height);
-  fclose(f);
-You can use RGBE_Read_Pixels instead but it will not handle run length
-encoded file correctly.  For more information see the rgbe.c file.
-(Note: these files are available at http://www.graphics.cornell.edu/~bjw/ )
-
-Please note: By definition of the rgbe format, all pixels should be in 
-units of watts/steradian/meter^2 unless otherwise noted in the header.
-If the header contains an exposure field then dividing pixels values by
-the <exposure value> should result in values in watts/steradian/meter^2.
-See the rgbe.h file for other fields in the header which are supported.
-
-The ReadPixels and WritePixels routines can read/write and entire image, or
-a single pixel, or anything in between.  The run length encoding routines
-can only handle complete scanlines, but can handle single scanlines.  No
-checking is done to see that an image contains the correct number of pixels.
-
-The return codes for routines are defined by RGBE_RETURN_SUCCESS and
-RGBE_RETURN_FAILURE and these can be modified to be compatible with whatever
-error convention you are using.  Error reporting is handled by the rgbe_error
-routine.  You can easily modify this if you want errors to be reported 
-somewhere other than STDERR.
-
-/* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE.
- * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY,
- * IT IS STRICTLY USE AT YOUR OWN RISK.  */
-</HTML>
-