hard edges rework, add hard edge in gwdw, config.ac nv/cuda tweaks, message log warn...

[goodguy/cinelerra.git] / cinelerra-5.1 / guicast / bcresources.C

diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
index 43a713e7a47ac80d49929fdebdca4bb09e83f8db..16f53f97b0fad8476f6d04dd8d4861fea7cf54cb 100644 (file)
--- a/cinelerra-5.1/guicast/bcresources.C
+++ b/cinelerra-5.1/guicast/bcresources.C
@@ -955,6 +955,8 @@ BC_Resources::~BC_Resources()
        del_vframes(default_pot_images, 3);
        del_vframes(default_progress_images, 2);
        del_vframes(default_medium_7segment, 20);
+       del_vframes(default_vscroll_data, 10);
+       del_vframes(default_hscroll_data, 10);
        if( fontlist ) {
                fontlist->remove_all_objects();
                delete fontlist;
@@ -1774,33 +1776,7 @@ int utf8conv::
 wnext()
 {
   int v = 0, n = 0, ch = next();
-  if( ch == '\\' ) {
-    switch( (ch=next()) ) {
-    case 'n': return '\n';
-    case 't': return '\t';
-    case 'r': return '\r';
-    case 'b': return '\b';
-    case 'f': return '\f';
-    case 'v': return '\v';
-    case 'a': return '\a';
-    case '0': case '1': case '2': case '3':
-    case '4': case '5': case '6': case '7':
-      v = ch - '0';
-      for( int i=3; --i>0; v=v*8+ch, next() )
-        if( (ch=cur()-'0') < 0 || ch >= 8 ) break;
-      return v;
-    case 'x':  n = 2;  break;
-    case 'u':  n = 4;  break;
-    case 'U':  n = 8;  break;
-    default: return ch;
-    }
-    for( int i=n; --i>=0; v=v*16+ch, next() ) {
-      if( (ch=cur()-'0')>=0 && ch<10 ) continue;
-      if( (ch-='A'-'0'-10)>=10 && ch<16 ) continue;
-      if( (ch-='a'-'A')<10 || ch>=16 ) break;
-    }
-  }
-  else if( ch >= 0x80 ) {
+  if( ch >= 0x80 ) {
     static const unsigned char byts[] = {
       1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4, 5,
     };