Revision: 56759
http://sourceforge.net/p/brlcad/code/56759
Author: mohitdaga
Date: 2013-08-12 20:48:11 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
As per Sean's suggestion, Change the name if icv api (save to write)
Modified Paths:
--------------
brlcad/trunk/include/icv.h
brlcad/trunk/src/libged/screengrab.c
brlcad/trunk/src/libicv/bw.c
brlcad/trunk/src/libicv/fileformat.c
brlcad/trunk/src/libicv/pix.c
brlcad/trunk/src/rt/do.c
brlcad/trunk/src/util/bwrect.c
Modified: brlcad/trunk/include/icv.h
===================================================================
--- brlcad/trunk/include/icv.h 2013-08-12 20:08:08 UTC (rev 56758)
+++ brlcad/trunk/include/icv.h 2013-08-12 20:48:11 UTC (rev 56759)
@@ -187,7 +187,7 @@
* @param format Specific format of the file to be saved.
* @return on success 0, on failure -1 with log messages.
*/
-ICV_EXPORT extern int icv_save(icv_image_t *bif, const char*filename,
ICV_IMAGE_FORMAT format);
+ICV_EXPORT extern int icv_write(icv_image_t *bif, const char*filename,
ICV_IMAGE_FORMAT format);
/**
* Load a file into an ICV struct. For most formats, this will be called with
Modified: brlcad/trunk/src/libged/screengrab.c
===================================================================
--- brlcad/trunk/src/libged/screengrab.c 2013-08-12 20:08:08 UTC (rev
56758)
+++ brlcad/trunk/src/libged/screengrab.c 2013-08-12 20:48:11 UTC (rev
56759)
@@ -112,7 +112,7 @@
}
if (bif != NULL) {
- icv_save(bif, argv[1], ICV_IMAGE_AUTO);
+ icv_write(bif, argv[1], ICV_IMAGE_AUTO);
icv_free(bif);
bif = NULL;
}
Modified: brlcad/trunk/src/libicv/bw.c
===================================================================
--- brlcad/trunk/src/libicv/bw.c 2013-08-12 20:08:08 UTC (rev 56758)
+++ brlcad/trunk/src/libicv/bw.c 2013-08-12 20:48:11 UTC (rev 56759)
@@ -45,7 +45,7 @@
#define WRMODE S_IRUSR|S_IRGRP|S_IROTH
HIDDEN int
-bw_save(icv_image_t *bif, const char *filename)
+bw_write(icv_image_t *bif, const char *filename)
{
unsigned char *data;
@@ -55,24 +55,24 @@
if (bif->color_space == ICV_COLOR_SPACE_RGB) {
icv_rgb2gray(bif, 0, 0, 0, 0, 0);
} else if (bif->color_space != ICV_COLOR_SPACE_GRAY) {
- bu_log("bw_save : Color Space conflict");
+ bu_log("bw_write : Color Space conflict");
return -1;
}
data = data2uchar(bif);
size = (size_t) bif->height*bif->width;
-
+
if(filename==NULL)
fd = fileno(stdout);
else if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, WRMODE))
< 0) {
- bu_log("bw_save: Cannot open file for saving\n");
+ bu_log("bw_write: Cannot open file for saving\n");
return -1;
}
ret = write(fd, data, size);
close(fd);
- bu_free(data, "bw_save : Unsigned Char data");
+ bu_free(data, "bw_write : Unsigned Char data");
if (ret != size) {
- bu_log("bw_save : Short Write\n");
+ bu_log("bw_write : Short Write\n");
return -1;
}
Modified: brlcad/trunk/src/libicv/fileformat.c
===================================================================
--- brlcad/trunk/src/libicv/fileformat.c 2013-08-12 20:08:08 UTC (rev
56758)
+++ brlcad/trunk/src/libicv/fileformat.c 2013-08-12 20:48:11 UTC (rev
56759)
@@ -48,11 +48,11 @@
extern HIDDEN unsigned char *data2uchar(const icv_image_t *bif);
/* defined in bw.c */
-extern HIDDEN int bw_save(icv_image_t *bif, const char *filename);
+extern HIDDEN int bw_write(icv_image_t *bif, const char *filename);
extern HIDDEN icv_image_t *bw_load(const char *filename, int width, int
height);
/* defined in pix.c */
-extern HIDDEN int pix_save(icv_image_t *bif, const char *filename);
+extern HIDDEN int pix_write(icv_image_t *bif, const char *filename);
extern HIDDEN icv_image_t *pix_load(const char* filename, int width, int
height);
/* private functions */
@@ -113,7 +113,7 @@
}
HIDDEN int
-png_save(icv_image_t *bif, const char *filename)
+png_write(icv_image_t *bif, const char *filename)
{
png_structp png_ptr = NULL;
png_infop info_ptr = NULL;
@@ -125,7 +125,7 @@
fh = fopen(filename, "w");
if (UNLIKELY(fh==NULL)) {
perror("fdopen");
- bu_log("ERROR: png_save failed to get a FILE pointer\n");
+ bu_log("ERROR: png_write failed to get a FILE pointer\n");
return 0;
}
@@ -160,7 +160,7 @@
}
HIDDEN int
-ppm_save(icv_image_t *bif, const char *filename)
+ppm_write(icv_image_t *bif, const char *filename)
{
unsigned char *data;
int fd;
@@ -172,7 +172,7 @@
if (bif->color_space == ICV_COLOR_SPACE_GRAY) {
icv_gray2rgb(bif);
} else if (bif->color_space != ICV_COLOR_SPACE_RGB) {
- bu_log("ppm_save : Color Space conflict");
+ bu_log("ppm_write : Color Space conflict");
return -1;
}
data = data2uchar(bif);
@@ -184,7 +184,7 @@
ret = write(fd, data, size);
close(fd);
if (ret != size) {
- bu_log("ppm_save : Short Write");
+ bu_log("ppm_write : Short Write");
return -1;
}
return 0;
@@ -215,7 +215,7 @@
int
-icv_save(icv_image_t *bif, const char *filename, ICV_IMAGE_FORMAT format)
+icv_write(icv_image_t *bif, const char *filename, ICV_IMAGE_FORMAT format)
{
/* FIXME: should not be introducing fixed size buffers */
char buf[BUFSIZ] = {0};
@@ -226,20 +226,20 @@
switch(format) {
/* case ICV_IMAGE_BMP:
- return bmp_save(bif, filename); */
+ return bmp_write(bif, filename); */
case ICV_IMAGE_PPM:
- return ppm_save(bif, filename);
+ return ppm_write(bif, filename);
case ICV_IMAGE_PNG:
- return png_save(bif, filename);
+ return png_write(bif, filename);
case ICV_IMAGE_PIX:
- return pix_save(bif, filename);
+ return pix_write(bif, filename);
case ICV_IMAGE_BW:
- return bw_save(bif, filename);
+ return bw_write(bif, filename);
default:
bu_log("Unrecognized format. Outputting in PIX format.\n");
}
- return pix_save(bif, filename);
+ return pix_write(bif, filename);
}
Modified: brlcad/trunk/src/libicv/pix.c
===================================================================
--- brlcad/trunk/src/libicv/pix.c 2013-08-12 20:08:08 UTC (rev 56758)
+++ brlcad/trunk/src/libicv/pix.c 2013-08-12 20:48:11 UTC (rev 56759)
@@ -42,7 +42,7 @@
extern HIDDEN unsigned char *data2uchar(const icv_image_t *bif);
HIDDEN int
-pix_save(icv_image_t *bif, const char *filename)
+pix_write(icv_image_t *bif, const char *filename)
{
unsigned char *data;
int fd;
@@ -51,14 +51,14 @@
if (bif->color_space == ICV_COLOR_SPACE_GRAY) {
icv_gray2rgb(bif);
} else if (bif->color_space != ICV_COLOR_SPACE_RGB) {
- bu_log("pix_save : Color Space conflict");
+ bu_log("pix_write : Color Space conflict");
return -1;
}
if(filename==NULL)
fd = fileno(stdout);
else if ((fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, WRMODE))
< 0) {
- bu_log("pix_save: Cannot open file for saving\n");
+ bu_log("pix_write: Cannot open file for saving\n");
return -1;
}
@@ -67,7 +67,7 @@
ret = write(fd, data, size);
close(fd);
if (ret != size) {
- bu_log("pix_save : Short Write");
+ bu_log("pix_write : Short Write");
return -1;
}
return 0;
Modified: brlcad/trunk/src/rt/do.c
===================================================================
--- brlcad/trunk/src/rt/do.c 2013-08-12 20:08:08 UTC (rev 56758)
+++ brlcad/trunk/src/rt/do.c 2013-08-12 20:48:11 UTC (rev 56759)
@@ -920,7 +920,7 @@
wallclock, ((double)(rtip->rti_nrays))/wallclock);
}
if (bif != NULL) {
- icv_save(bif, framename, ICV_IMAGE_AUTO);
+ icv_write(bif, framename, ICV_IMAGE_AUTO);
icv_free(bif);
bif = NULL;
}
Modified: brlcad/trunk/src/util/bwrect.c
===================================================================
--- brlcad/trunk/src/util/bwrect.c 2013-08-12 20:08:08 UTC (rev 56758)
+++ brlcad/trunk/src/util/bwrect.c 2013-08-12 20:48:11 UTC (rev 56759)
@@ -121,7 +121,7 @@
if((img = icv_load(in_file, ICV_IMAGE_BW, inx, iny))==NULL)
return 1;
icv_rect(img, xorig, yorig, outx, outy);
- icv_save(img, out_file , ICV_IMAGE_BW);
+ icv_write(img, out_file , ICV_IMAGE_BW);
icv_free(img);
return 0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
