Changeset 3451Tweet

Timestamp:

May 14, 2009, 10:43:52 AM (13 years ago)

Author:

Sam Hocevar

Message:

Fix a few implicit cast related warnings on VC++.

Location:

libcaca/trunk/caca/codec

Files:

• export.c (modified) (1 diff)
• import.c (modified) (5 diffs)

libcaca/trunk/caca/codec/export.c

@@ -1126 +1126 @@
                 case '<': cur += sprintf(cur, "&lt;"); break;
                 case '&': cur += sprintf(cur, "&amp;"); break;
-                default: *cur++ = ch; break;
+                default: *cur++ = (uint8_t)ch; break;
             }
             cur += sprintf(cur, "</text>\n");

libcaca/trunk/caca/codec/import.c

@@ -161 +161 @@
     caca_file_t *f;
     char *data = NULL;
-    ssize_t size = 0;
-    int ret;
+    ssize_t ret, size = 0;
 
     f = caca_file_open(filename, "rb");
@@ -178 +177 @@
         }
 
-        ret = caca_file_read(f, data + size, 1024);
+        ret = (ssize_t)caca_file_read(f, data + size, 1024);
         if(ret >= 0)
             size += ret;
@@ -331 +330 @@
     caca_set_frame(cv, 0);
 
-    return 4 + control_size + data_size;
+    return (ssize_t)(4 + control_size + data_size);
 
 invalid_caca:
@@ -377 +376 @@
         caca_set_canvas_size(cv, width, height = y);
 
-    return size;
+    return (ssize_t)size;
 }
 
@@ -712 +711 @@
             }
             wch = caca_utf32_is_fullwidth(ch) ? 2 : 1;
-            skip += bytes - 1;
+            skip += (int)(bytes - 1);
         }
         else