Updates after feedback #3

livecodepanos · livecodepanos · commit 78da976935fb · 2013-11-20T13:03:14.000Z
diff --git a/engine/src/exec-interface-image.cpp b/engine/src/exec-interface-image.cpp
@@ -358,7 +358,7 @@ void MCImage::SetText(MCExecContext& ctxt, MCDataRef p_text)
 	MCImageBitmap *t_bitmap = nil;
 	MCImageCompressedBitmap *t_compressed = nil;
 	MCPoint t_hotspot;
-	char *t_name = nil;
+	MCStringRef t_name = nil;
 	IO_handle t_stream = nil;
     MCAutoDataRef t_data;
 	
@@ -390,7 +390,7 @@ void MCImage::SetText(MCExecContext& ctxt, MCDataRef p_text)
 		
 		MCImageFreeBitmap(t_bitmap);
 		MCImageFreeCompressedBitmap(t_compressed);
-		MCCStringFree(t_name);
+		MCValueRelease(t_name);
 		if (t_stream != nil)
 			MCS_close(t_stream);
 	}
diff --git a/engine/src/ibmp.cpp b/engine/src/ibmp.cpp
@@ -1587,7 +1587,7 @@ bool c_get_string_content_bounds(const char *p_line, uindex_t &r_content_start,
 }
 
 #define XBM_MAX_LINE 128
-bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, char *&r_name, MCImageBitmap *&r_bitmap)
+bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, MCStringRef &r_name, MCImageBitmap *&r_bitmap)
 {
 	bool t_success = true;
 
@@ -1729,7 +1729,7 @@ bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, char *&r_name, MCI
 	if (t_success)
 	{
 		r_bitmap = t_bitmap;
-		r_name = t_name;
+        t_success = MCStringCreateWithCString(t_name, r_name);
 		r_hotspot = t_hotspot;
 	}
 	else
diff --git a/engine/src/iimport.cpp b/engine/src/iimport.cpp
@@ -158,7 +158,7 @@ bool MCImageDecode(IO_handle p_stream, MCImageFrame *&r_frames, uindex_t &r_fram
 	MCImageCompressedBitmap *t_compressed = nil;
 
 	MCPoint t_hotspot;
-	char *t_name = nil;
+	MCStringRef t_name = nil;
 
 	if (t_success)
 		t_success = MCImageImport(p_stream, nil, t_hotspot, t_name, t_compressed, t_bitmap);
@@ -181,7 +181,7 @@ bool MCImageDecode(IO_handle p_stream, MCImageFrame *&r_frames, uindex_t &r_fram
 
 	MCImageFreeCompressedBitmap(t_compressed);
 	MCImageFreeBitmap(t_bitmap);
-	MCCStringFree(t_name);
+	MCValueRelease(t_name);
 
 	return t_success;
 }
@@ -206,7 +206,7 @@ bool MCImageDecode(const uint8_t *p_data, uindex_t p_size, MCImageFrame *&r_fram
 }
 
 // if the image is in a directly supported format return the raw data otherwise decode & return the bitmap
-bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, char *&r_name, MCImageCompressedBitmap *&r_compressed, MCImageBitmap *&r_bitmap)
+bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, MCStringRef&r_name, MCImageCompressedBitmap *&r_compressed, MCImageBitmap *&r_bitmap)
 {
 	bool t_success = true;
 
@@ -273,9 +273,7 @@ bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotsp
 				t_success = MCImageDecodeXWD(p_stream, &t_name, t_bitmap);
 				if (t_success)
                 {
-                    char *temp;
-                    /* UNCHECKED */ MCStringConvertToCString(*t_name, temp);
-                    r_name = temp;
+                    r_name = MCValueRetain(*t_name);
                 }
                 
             }
@@ -296,7 +294,7 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream
 
 	MCImageCompressedBitmap *t_compressed = nil;
 	MCImageBitmap *t_bitmap = nil;
-	char *t_name = nil;
+	MCStringRef t_name = nil;
 	MCPoint t_hotspot = {1, 1};
 
 	t_success = MCImageImport(stream, mstream, t_hotspot, t_name, t_compressed, t_bitmap);
@@ -338,7 +336,11 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream
 		}
 
 		if (isunnamed() && t_name != nil)
-			setname_cstring(t_name);
+        {
+            MCNewAutoNameRef t_name_nameref;
+            /* UNCHECKED */ MCNameCreate(t_name, &t_name_nameref);
+			setname(*t_name_nameref);
+        }
 		if (isunnamed() && newname != nil)
 		{
 			const char *tname = strrchr(newname, PATH_SEPARATOR);
@@ -351,7 +353,7 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream
 
 	}
 
-	MCCStringFree(t_name);
+	MCValueRelease(t_name);
 
 	return t_success ? IO_NORMAL : IO_ERROR;
 }
diff --git a/engine/src/image.h b/engine/src/image.h
@@ -78,7 +78,7 @@ bool MCImageEncodePBM(MCImageBitmap *p_bitmap, IO_handle p_stream, uindex_t &r_b
 bool MCImageEncodePPM(MCImageBitmap *p_bitmap, IO_handle p_stream, uindex_t &r_bytes_written);
 bool MCImageDecodeNetPBM(IO_handle p_stream, MCImageBitmap *&r_bitmap);
 
-bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, char *&r_name, MCImageBitmap *&r_bitmap);
+bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, MCStringRef &r_name, MCImageBitmap *&r_bitmap);
 bool MCImageDecodeXPM(IO_handle p_stream, MCImageBitmap *&r_bitmap);
 bool MCImageDecodeXWD(IO_handle stream, MCStringRef &r_name, MCImageBitmap *&r_bitmap);
 
@@ -116,7 +116,7 @@ bool MCImageCompress(MCImageBitmap *p_bitmap, bool p_dither, MCImageCompressedBi
 bool MCImageDecompress(MCImageCompressedBitmap *p_compressed, MCImageFrame *&r_frames, uindex_t &r_frame_count);
 
 bool MCImageGetMetafileGeometry(IO_handle p_stream, uindex_t &r_width, uindex_t &r_height);
-bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, char *&r_name, MCImageCompressedBitmap *&r_compressed, MCImageBitmap *&r_bitmap);
+bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, MCStringRef &r_name, MCImageCompressedBitmap *&r_compressed, MCImageBitmap *&r_bitmap);
 bool MCImageExport(MCImageBitmap *p_bitmap, Export_format p_format, MCImagePaletteSettings *p_palette_settings, bool p_dither, IO_handle p_stream, IO_handle p_mask_stream);
 
 bool MCImageDecode(IO_handle p_stream, MCImageFrame *&r_frames, uindex_t &r_frame_count);
diff --git a/engine/src/image_rep_encoded.cpp b/engine/src/image_rep_encoded.cpp
@@ -51,7 +51,7 @@ bool MCEncodedImageRep::LoadImageFrames(MCImageFrame *&r_frames, uindex_t &r_fra
 	MCImageBitmap *t_bitmap = nil;
 
 	MCPoint t_hotspot = {1, 1};
-	char *t_name = nil;
+	MCStringRef t_name = nil;
 
 	t_success = GetDataStream(t_stream) &&
 		MCImageImport(t_stream, t_mask_stream, t_hotspot, t_name, t_compressed, t_bitmap);
@@ -88,7 +88,7 @@ bool MCEncodedImageRep::LoadImageFrames(MCImageFrame *&r_frames, uindex_t &r_fra
 		m_have_geometry = true;
 	}
 
-	MCCStringFree(t_name);
+	MCValueRelease(t_name);
 	
 	MCImageFreeBitmap(t_bitmap);
 	MCImageFreeCompressedBitmap(t_compressed);

Original file line number	Diff line number	Diff line change
`@@ -1587,7 +1587,7 @@ bool c_get_string_content_bounds(const char *p_line, uindex_t &r_content_start,`
`1587`	`1587`	`}`
`1588`	`1588`
`1589`	`1589`	`#define XBM_MAX_LINE 128`
`1590`		`-bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, char &r_name, MCImageBitmap &r_bitmap)`
	`1590`	`+bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, MCStringRef &r_name, MCImageBitmap *&r_bitmap)`
`1591`	`1591`	`{`
`1592`	`1592`	`bool t_success = true;`
`1593`	`1593`
`@@ -1729,7 +1729,7 @@ bool MCImageDecodeXBM(IO_handle p_stream, MCPoint &r_hotspot, char *&r_name, MCI`
`1729`	`1729`	`if (t_success)`
`1730`	`1730`	`{`
`1731`	`1731`	`r_bitmap = t_bitmap;`
`1732`		`- r_name = t_name;`
	`1732`	`+ t_success = MCStringCreateWithCString(t_name, r_name);`
`1733`	`1733`	`r_hotspot = t_hotspot;`
`1734`	`1734`	`}`
`1735`	`1735`	`else`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ bool MCImageDecode(IO_handle p_stream, MCImageFrame *&r_frames, uindex_t &r_fram`
`158`	`158`	`MCImageCompressedBitmap *t_compressed = nil;`
`159`	`159`
`160`	`160`	`MCPoint t_hotspot;`
`161`		`- char *t_name = nil;`
	`161`	`+ MCStringRef t_name = nil;`
`162`	`162`
`163`	`163`	`if (t_success)`
`164`	`164`	`t_success = MCImageImport(p_stream, nil, t_hotspot, t_name, t_compressed, t_bitmap);`
`@@ -181,7 +181,7 @@ bool MCImageDecode(IO_handle p_stream, MCImageFrame *&r_frames, uindex_t &r_fram`
`181`	`181`
`182`	`182`	`MCImageFreeCompressedBitmap(t_compressed);`
`183`	`183`	`MCImageFreeBitmap(t_bitmap);`
`184`		`- MCCStringFree(t_name);`
	`184`	`+ MCValueRelease(t_name);`
`185`	`185`
`186`	`186`	`return t_success;`
`187`	`187`	`}`
`@@ -206,7 +206,7 @@ bool MCImageDecode(const uint8_t p_data, uindex_t p_size, MCImageFrame &r_fram`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`// if the image is in a directly supported format return the raw data otherwise decode & return the bitmap`
`209`		`-bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, char &r_name, MCImageCompressedBitmap &r_compressed, MCImageBitmap *&r_bitmap)`
	`209`	`+bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotspot, MCStringRef&r_name, MCImageCompressedBitmap &r_compressed, MCImageBitmap &r_bitmap)`
`210`	`210`	`{`
`211`	`211`	`bool t_success = true;`
`212`	`212`
`@@ -273,9 +273,7 @@ bool MCImageImport(IO_handle p_stream, IO_handle p_mask_stream, MCPoint &r_hotsp`
`273`	`273`	`t_success = MCImageDecodeXWD(p_stream, &t_name, t_bitmap);`
`274`	`274`	`if (t_success)`
`275`	`275`	`{`
`276`		`- char *temp;`
`277`		`- /* UNCHECKED / MCStringConvertToCString(t_name, temp);`
`278`		`- r_name = temp;`
	`276`	`+ r_name = MCValueRetain(*t_name);`
`279`	`277`	`}`
`280`	`278`
`281`	`279`	`}`
`@@ -296,7 +294,7 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream`
`296`	`294`
`297`	`295`	`MCImageCompressedBitmap *t_compressed = nil;`
`298`	`296`	`MCImageBitmap *t_bitmap = nil;`
`299`		`- char *t_name = nil;`
	`297`	`+ MCStringRef t_name = nil;`
`300`	`298`	`MCPoint t_hotspot = {1, 1};`
`301`	`299`
`302`	`300`	`t_success = MCImageImport(stream, mstream, t_hotspot, t_name, t_compressed, t_bitmap);`
`@@ -338,7 +336,11 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream`
`338`	`336`	`}`
`339`	`337`
`340`	`338`	`if (isunnamed() && t_name != nil)`
`341`		`- setname_cstring(t_name);`
	`339`	`+ {`
	`340`	`+ MCNewAutoNameRef t_name_nameref;`
	`341`	`+ /* UNCHECKED */ MCNameCreate(t_name, &t_name_nameref);`
	`342`	`+ setname(*t_name_nameref);`
	`343`	`+ }`
`342`	`344`	`if (isunnamed() && newname != nil)`
`343`	`345`	`{`
`344`	`346`	`const char *tname = strrchr(newname, PATH_SEPARATOR);`
`@@ -351,7 +353,7 @@ IO_stat MCImage::import(const char *newname, IO_handle stream, IO_handle mstream`
`351`	`353`
`352`	`354`	`}`
`353`	`355`
`354`		`- MCCStringFree(t_name);`
	`356`	`+ MCValueRelease(t_name);`
`355`	`357`
`356`	`358`	`return t_success ? IO_NORMAL : IO_ERROR;`
`357`	`359`	`}`