Having a better life with the memory...

2 files changed, 61 insertions, 63 deletions

diff --git a/Dalos/Dalos.cc b/Dalos/Dalos.cc
index bbfdadf..b6e6a75 100644
--- a/Dalos/Dalos.cc
+++ b/Dalos/Dalos.cc
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 

  */

 

-/* $Id: Dalos.cc,v 1.13 2004-12-27 18:46:43 pixel Exp $ */

+/* $Id: Dalos.cc,v 1.14 2004-12-29 01:58:33 pixel Exp $ */

 

 #include <SDL.h>

 #include <SDL_thread.h>

@@ -113,7 +113,6 @@ static void lua_hook(lua_State * _L, lua_Debug * ar) {
 

 void start_lua() {

     Lua * L = new threaded_Lua();

-    Buffer built;

     bool use_builtin_cdtool = false;

     int i;

     

@@ -145,10 +144,9 @@ void start_lua() {
         use_builtin_cdtool = true;

     }

     

-    if (use_builtin_cdtool) {    

-        for (i = 0; i < cd_tool_lua_size; i++) {

-            built.writeU8(cd_tool_lua[i]);

-        }

+    if (use_builtin_cdtool) {

+        Buffer built;

+        built.write(cd_tool_lua, cd_tool_lua_size);

         try {

             L->load(&built);

         }

diff --git a/Dalos/Hexview.h b/Dalos/Hexview.h
index 4caf67b..1d604cc 100644
--- a/Dalos/Hexview.h
+++ b/Dalos/Hexview.h
@@ -1,59 +1,59 @@
-/* 

- *  Dalos

- *  Copyright (C) 2003-2005 Nicolas "Pixel" Noble 

- * 

- *  This program is free software; you can redistribute it and/or modify 

- *  it under the terms of the GNU General Public License as published by 

- *  the Free Software Foundation; either version 2 of the License, or 

- *  (at your option) any later version. 

- * 

- *  This program is distributed in the hope that it will be useful, 

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of 

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 

- *  GNU General Public License for more details. 

- * 

- *  You should have received a copy of the GNU General Public License 

- *  along with this program; if not, write to the Free Software 

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 

- */

-

-/* $Id: Hexview.h,v 1.1 2004-12-26 03:29:10 pixel Exp $ */

-

-#ifndef __HEXVIEW_H__

-#define __HEXVIEW_H__

-

+/* 
+ *  Dalos
+ *  Copyright (C) 2003-2005 Nicolas "Pixel" Noble 
+ * 
+ *  This program is free software; you can redistribute it and/or modify 
+ *  it under the terms of the GNU General Public License as published by 
+ *  the Free Software Foundation; either version 2 of the License, or 
+ *  (at your option) any later version. 
+ * 
+ *  This program is distributed in the hope that it will be useful, 
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ *  GNU General Public License for more details. 
+ * 
+ *  You should have received a copy of the GNU General Public License 
+ *  along with this program; if not, write to the Free Software 
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+
+/* $Id: Hexview.h,v 1.2 2004-12-29 01:58:33 pixel Exp $ */
+
+#ifndef __HEXVIEW_H__
+#define __HEXVIEW_H__
+
 #include <engine.h>
 #include <widgets.h>
-

-class hexview : public mogltk::widget {

-  public:

-    class hexview_keyevent : public mogltk::engine::keyevent {

-      public:

-        virtual void down(SDL_keysym k);

-        virtual void up(SDL_keysym k);

-    };

-      hexview(mogltk::shape * sh, mogltk::widget * father);

-      virtual ~hexview();

-    void set_virtual_base(int _virtual_base);

-    int get_nlines();

-    int get_size();

-    void change_width(int _width);

-    int get_width();

-    void change_offset(int _offset);

-    int get_offset();

-    void change_shift(int _shift);

-    int get_shift();

-    void bind_handle(Handle * _h);

-    Uint8 * get_data();

-    virtual void draw();

-  protected:

-    virtual void resize_notify();

-  private:

-    Handle * h;

-    int width, offset, nlines;

-    int offset_loaded, size_loaded, virtual_base;

-    int shift;

-    Uint8 * data;

-} * CurrentHexview;

-

-#endif

+
+class hexview : public mogltk::widget {
+  public:
+    class hexview_keyevent : public mogltk::engine::keyevent {
+      public:
+        virtual void down(SDL_keysym k);
+        virtual void up(SDL_keysym k);
+    };
+      hexview(mogltk::shape * sh, mogltk::widget * father);
+      virtual ~hexview();
+    void set_virtual_base(int _virtual_base);
+    int get_nlines();
+    int get_size();
+    void change_width(int _width);
+    int get_width();
+    void change_offset(int _offset);
+    int get_offset();
+    void change_shift(int _shift);
+    int get_shift();
+    void bind_handle(Handle * _h);
+    Uint8 * get_data();
+    virtual void draw();
+  protected:
+    virtual void resize_notify();
+  private:
+    Handle * h;
+    int width, offset, nlines;
+    int offset_loaded, size_loaded, virtual_base;
+    int shift;
+    Uint8 * data;
+} * CurrentHexview;
+
+#endif