Return SkString instead of char[]

diff --git a/include/c/xamarin/sk_x_imagedecoder.h b/include/c/xamarin/sk_x_imagedecoder.h
index 60e8fd6..e2a1856 100644 (file)
--- a/include/c/xamarin/sk_x_imagedecoder.h
+++ b/include/c/xamarin/sk_x_imagedecoder.h
@@ -19,8 +19,8 @@ SK_C_PLUS_PLUS_BEGIN_GUARD
 SK_API void sk_imagedecoder_destructor(sk_imagedecoder_t* cdecoder);
 SK_API sk_imagedecoder_format_t sk_imagedecoder_get_decoder_format(sk_imagedecoder_t* cdecoder);
 SK_API sk_imagedecoder_format_t sk_imagedecoder_get_stream_format(sk_stream_streamrewindable_t* cstream);
-SK_API const char* sk_imagedecoder_get_format_name_from_format(sk_imagedecoder_format_t cformat);
-SK_API const char* sk_imagedecoder_get_format_name_from_decoder(sk_imagedecoder_t* cdecoder);
+SK_API sk_string_t* sk_imagedecoder_get_format_name_from_format(sk_imagedecoder_format_t cformat);
+SK_API sk_string_t* sk_imagedecoder_get_format_name_from_decoder(sk_imagedecoder_t* cdecoder);
 SK_API bool sk_imagedecoder_get_skip_writing_zeros(sk_imagedecoder_t* cdecoder);
 SK_API void sk_imagedecoder_set_skip_writing_zeros(sk_imagedecoder_t* cdecoder, bool skip);
 SK_API bool sk_imagedecoder_get_dither_image(sk_imagedecoder_t* cdecoder);

diff --git a/src/c/xamarin/sk_x_imagedecoder.cpp b/src/c/xamarin/sk_x_imagedecoder.cpp
index 0fa8231..4d64849 100644 (file)
--- a/src/c/xamarin/sk_x_imagedecoder.cpp
+++ b/src/c/xamarin/sk_x_imagedecoder.cpp
@@ -36,18 +36,18 @@ sk_imagedecoder_format_t sk_imagedecoder_get_stream_format(sk_stream_streamrewin
     return UNKNOWN_SK_IMAGEDECODER_FORMAT;
 }
 
-const char* sk_imagedecoder_get_format_name_from_format(sk_imagedecoder_format_t cformat)
+sk_string_t* sk_imagedecoder_get_format_name_from_format(sk_imagedecoder_format_t cformat)
 {
     SkImageDecoder::Format format;
     if (find_sk(cformat, &format)) {
-        return SkImageDecoder::GetFormatName(format);
+        return ToString(new SkString(SkImageDecoder::GetFormatName(format)));
     }
     return nullptr;
 }
 
-const char* sk_imagedecoder_get_format_name_from_decoder(sk_imagedecoder_t* cdecoder)
+sk_string_t* sk_imagedecoder_get_format_name_from_decoder(sk_imagedecoder_t* cdecoder)
 {
-    return AsImageDecoder(cdecoder)->getFormatName();
+    return ToString(new SkString(AsImageDecoder(cdecoder)->getFormatName()));
 }
 
 bool sk_imagedecoder_get_skip_writing_zeros(sk_imagedecoder_t* cdecoder)