use SvPVbyte() where appropriate for i_io_*write()

diff --git a/Imager.xs b/Imager.xs
index e5c44a21c6e681eef09be75eba231f820ff54c7f..f0b6c4d9cf4ee90126e8ff14935d1cad8cf8b740 100644 (file)
--- a/Imager.xs
+++ b/Imager.xs
@@ -1198,14 +1198,7 @@ i_io_raw_write(ig, data_sv)
         void *data;
        STRLEN size;
       CODE:
         void *data;
        STRLEN size;
       CODE:

-#ifdef SvUTF8
-        if (SvUTF8(data_sv)) {
-         data_sv = sv_2mortal(newSVsv(data_sv));
-          /* yes, we want this to croak() if the SV can't be downgraded */
-         sv_utf8_downgrade(data_sv, FALSE);
-       }
-#endif        
-       data = SvPV(data_sv, size);
+       data = SvPVbyte(data_sv, size);

         RETVAL = i_io_raw_write(ig, data, size);
       OUTPUT:
        RETVAL
         RETVAL = i_io_raw_write(ig, data, size);
       OUTPUT:
        RETVAL


@@ -1430,14 +1423,7 @@ i_io_write(ig, data_sv)
         void *data;
        STRLEN size;
       CODE:
         void *data;
        STRLEN size;
       CODE:

-#ifdef SvUTF8
-        if (SvUTF8(data_sv)) {
-         data_sv = sv_2mortal(newSVsv(data_sv));
-          /* yes, we want this to croak() if the SV can't be downgraded */
-         sv_utf8_downgrade(data_sv, FALSE);
-       }
-#endif        
-       data = SvPV(data_sv, size);
+       data = SvPVbyte(data_sv, size);

         RETVAL = i_io_write(ig, data, size);
       OUTPUT:
        RETVAL
         RETVAL = i_io_write(ig, data, size);
       OUTPUT:
        RETVAL

diff --git a/t/t07iolayer.t b/t/t07iolayer.t
index f80ed89e7139d329899aa9a1d5ed5e6f096178ed..76388a9dd26a5bcacb81daa47b30f2440fec76dc 100644 (file)
--- a/t/t07iolayer.t
+++ b/t/t07iolayer.t
@@ -229,8 +229,9 @@ SKIP:
   my $result = 
     eval {
       $io->raw_write($data);
   my $result = 
     eval {
       $io->raw_write($data);

+      1;

     };
     };

-  ok($@, "should have croaked")
+  ok(!$result, "should have croaked")

     and print "# $@\n";
 }
 
     and print "# $@\n";
 }