Changeset 18324 for trunk/Ohana

Timestamp:

Jun 26, 2008, 8:40:25 AM (18 years ago)

Author:

eugene

Message:

fix endpost errors in RemapXX.c

Location:

trunk/Ohana/src/kapa2/src

Files:

• Remap16.c (modified) (3 diffs)
• Remap24.c (modified) (4 diffs)
• Remap32.c (modified) (3 diffs)
• Remap8.c (modified) (4 diffs)

trunk/Ohana/src/kapa2/src/Remap16.c

@@ -86 +86 @@
 
     /**** fill in area to the left of the picture ****/
-    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
+    for (jj = 0; (i_start > 0) && (jj < expand_out) && (j + jj < dy); jj++) { 
       out_pix2 = out_pix + jj*dx;
       for (i = 0; i < i_start; i++, out_pix2++) {
@@ -104 +104 @@
         pixvalue = pixel[*in_pix2];
         out_pix2 = out_pix;
-        for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
+        for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++, out_pix2+=(dx-expand_out)) {
           for (ii = 0; ii < expand_out; ii++, out_pix2++) {
             *out_pix2 = pixvalue; 
@@ -114 +114 @@
     
     /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
+    for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++) {
       out_pix2 = out_pix + jj*dx;
       for (i = i_end; i < dx; i++, out_pix2++) {

trunk/Ohana/src/kapa2/src/Remap24.c

@@ -84 +84 @@
 
     /**** fill in area to the left of the picture ****/
-    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
+    for (jj = 0; (i_start > 0) && (jj < expand_out) && (j + jj < dy); jj++) { 
       out_pix2 = out_pix + jj*(3*dx + extra);
       for (i = 0; i < i_start; i++, out_pix2+=3) {
@@ -108 +108 @@
         pixvalue3 = pixel3[*in_pix2];
         out_pix2 = out_pix;
-        for (jj = 0; jj < expand_out; jj++, out_pix2+=3*(dx-expand_out)+extra) {
+        for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++, out_pix2+=3*(dx-expand_out)+extra) {
           for (ii = 0; ii < expand_out; ii++, out_pix2+=3) {
             out_pix2[0] = pixvalue1; 
@@ -120 +120 @@
     
     /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
+    for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++) {
+      //    for (jj = 0; jj < expand_out; jj++) {
       out_pix2 = out_pix + jj*(3*dx+extra);
       for (i = i_end; i < dx; i++, out_pix2+=3) {
@@ -142 +143 @@
 
   picture[0].pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-                                        picture[0].data, picture[0].dx, picture[0].dy, 32, 0);
+                                 picture[0].data, picture[0].dx, picture[0].dy, 32, 0);
 
   free (pixel1);

trunk/Ohana/src/kapa2/src/Remap32.c

@@ -100 +100 @@
 
     /**** fill in area to the left of the picture ****/
-    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
+    for (jj = 0; (i_start > 0) && (jj < expand_out) && (j + jj < dy); jj++) { 
       out_pix2 = out_pix + jj*dx;
       for (i = 0; i < i_start; i++, out_pix2++) {
@@ -118 +118 @@
         pixvalue = pixel[*in_pix2];
         out_pix2 = out_pix;
-        for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
+        for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++, out_pix2+=(dx-expand_out)) {
           for (ii = 0; ii < expand_out; ii++, out_pix2++) {
             *out_pix2 = pixvalue;
@@ -133 +133 @@
 
     /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
+    for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++) {
       out_pix2 = out_pix + jj*dx;
       for (i = i_end; i < dx; i++, out_pix2++) {

trunk/Ohana/src/kapa2/src/Remap8.c

@@ -69 +69 @@
 
     /**** fill in area to the left of the picture ****/
-    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
+    for (jj = 0; (i_start > 0) && (jj < expand_out) && (j + jj < dy); jj++) { 
       out_pix2 = out_pix + jj*dx;
       for (i = 0; i < i_start; i++, out_pix2++) {
@@ -87 +87 @@
         pixvalue = pixel[*in_pix2];
         out_pix2 = out_pix;
-        for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
+        for (jj = 0; (jj < expand_out) & (j + jj < dy); jj++, out_pix2+=(dx-expand_out)) {
           for (ii = 0; ii < expand_out; ii++, out_pix2++) {
             *out_pix2 = pixvalue;
@@ -97 +97 @@
     
     /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
+    for (jj = 0; (jj < expand_out) && (j + jj < dy); jj++) {
       out_pix2 = out_pix + jj*dx;
       for (i = i_end; i < dx; i++, out_pix2++) {
@@ -115 +115 @@
   }
   picture[0].pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-                                        picture[0].data, picture[0].dx, picture[0].dy, 8, 0);
+                                 picture[0].data, picture[0].dx, picture[0].dy, 8, 0);
   free (pixel);
 }