aboutsummaryrefslogtreecommitdiff
path: root/fly-tools/background/main.c
diff options
context:
space:
mode:
authormutantturkey <mutantturke@gmail.com>2012-07-05 19:07:22 -0400
committermutantturkey <mutantturke@gmail.com>2012-07-05 19:07:22 -0400
commit4faba574ffbf531095d3c482a7829920d4a9ac11 (patch)
tree1c9569e86e1878aebdc0d5efc1ec63ed3386d450 /fly-tools/background/main.c
parentf72244ec4abe39055e7c99e8f64d82c612bda9a5 (diff)
got rid of extra x and y variables, fixed our fopen, though there is still a problem with it
Diffstat (limited to 'fly-tools/background/main.c')
-rw-r--r--fly-tools/background/main.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/fly-tools/background/main.c b/fly-tools/background/main.c
index 1440a78..89ebd13 100644
--- a/fly-tools/background/main.c
+++ b/fly-tools/background/main.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv ) {
double green, red, blue;
- int i,j, k, x, y;
+ int i,j, k;
int image = 0;
char filename[256];
@@ -104,7 +104,6 @@ int main(int argc, char **argv ) {
printf("number of images: %d \n", nImages);
-
// initialize the storage arrays
uint8_t * array = (uint8_t *)malloc(nImages*height*width*3*sizeof(uint8_t));
@@ -117,7 +116,15 @@ int main(int argc, char **argv ) {
}
// store each pixel in the storage array. array(nImages,height,width,{ R, G, B} )
+ input_file = fopen( image_list, "r");
+ if(input_file == NULL ) {
+ printf("error could not open input file");
+ exit(1);
+ }
+
+
while ((fgets(filename, sizeof(filename), input_file)) != NULL ) {
+
temp = strchr(filename, '\n');
if (temp != NULL) *temp = '\0';
@@ -149,6 +156,8 @@ int main(int argc, char **argv ) {
image++;
}
+ fclose(input_file);
+
// calculate histograms
for (j = 0; j < height; j++) {
@@ -183,14 +192,14 @@ int main(int argc, char **argv ) {
MagickNewImage(output_wand,width,height,p_out);
output_iterator=NewPixelIterator(output_wand);
- for(x=0;x<height;x++) {
+ for(i=0; i<height; i++) {
- pixels=PixelGetNextIteratorRow(output_iterator,&y);
+ pixels=PixelGetNextIteratorRow(output_iterator,&j);
- for(y=0;y<width;y++) {
- sprintf(rgb, "rgb(%d,%d,%d)", output[x][y][0], output[x][y][1], output[x][y][2]);
- //printf("write (%d,%d), %s \n", x ,y, rgb);
- PixelSetColor(pixels[y],rgb);
+ for(j=0;j<width;j++) {
+ sprintf(rgb, "rgb(%d,%d,%d)", output[i][j][0], output[i][j][1], output[i][j][2]);
+ //printf("write (%d,%d), %s \n", i ,y, rgb);
+ PixelSetColor(pixels[j],rgb);
}
PixelSyncIterator(output_iterator);
}