GDI+ plugin: [nfc] use a const pointer for filename

The `FileStream` class does not need to modify this internally, so this avoids
the need for sketchy type casts.

diff --git a/plugin/gdiplus/FileStream.cpp b/plugin/gdiplus/FileStream.cpp
index f1ac14eea67c68afc2314f620cd68ce80f47b1e2..290445cfd92c7dfb26e72b6fce0972938c0b9e50 100644 (file)
--- a/plugin/gdiplus/FileStream.cpp
+++ b/plugin/gdiplus/FileStream.cpp
@@ -15,7 +15,7 @@
 
 
 
-IStream *FileStream::Create(char *name, FILE *file)
+IStream *FileStream::Create(const char *name, FILE *file)
 {
        return new FileStream(name, file);
 }
@@ -191,9 +191,8 @@ HRESULT FileStream::Clone(IStream **) {
        return E_NOTIMPL;
 }
 
-FileStream::FileStream(char *name, FILE *file): _ref(1), _name(name), _file(file)
-{
-}
+FileStream::FileStream(const char *name, FILE *file)
+    : _ref(1), _name(name), _file(file) {}
 
 void FileStream::UnixTimeToFileTime(time_t unixTime, FILETIME &fileTime)
 {

diff --git a/plugin/gdiplus/FileStream.h b/plugin/gdiplus/FileStream.h
index 6be27382fdbac312d08984871a3400f34578cd0b..0fdc2f228c6184e8ef55b2a21b689d2d54248615 100644 (file)
--- a/plugin/gdiplus/FileStream.h
+++ b/plugin/gdiplus/FileStream.h
@@ -19,7 +19,7 @@
 class FileStream : public IStream
 {
 public:
-       static IStream *Create(char* name, FILE *file);
+       static IStream *Create(const char *name, FILE *file);
 
        /* IUnknown methods */
 
@@ -81,12 +81,12 @@ public:
        virtual ~FileStream() = default;
 
 private:
-       FileStream(char *name, FILE *file);
+       FileStream(const char *name, FILE *file);
 
        static void UnixTimeToFileTime(time_t unixTime, FILETIME &fileTime);
 
        ULONG _ref;
-       char *_name;
+       const char *_name;
        FILE *_file;
 
 };

diff --git a/plugin/gdiplus/gvloadimage_gdiplus.cpp b/plugin/gdiplus/gvloadimage_gdiplus.cpp
index e7a56d787cb5bf21c6835b0be1379bd902a7ea44..d398e194be88889306353a61f4c731da6414a6d8 100644 (file)
--- a/plugin/gdiplus/gvloadimage_gdiplus.cpp
+++ b/plugin/gdiplus/gvloadimage_gdiplus.cpp
@@ -46,7 +46,7 @@ static Image* gdiplus_loadimage(GVJ_t * job, usershape_t *us)
 
                /* create image from the usershape file */
                /* NOTE: since Image::FromStream consumes the stream, we assume FileStream's lifetime should be shorter than us->name and us->f... */   
-               IStream *stream = FileStream::Create(const_cast<char*>(us->name), us->f);
+               IStream *stream = FileStream::Create(us->name, us->f);
                us->data = Image::FromStream (stream);
                
                /* clean up */