[gephex-devel] gephex--main--0.4--patch-1870

[gephex at sonnenland.kexbox.org]

Archive: gephex at gephex.org--2004
New revision: gephex--main--0.4--patch-1870

--
Revision: gephex--main--0.4--patch-1870
Archive: gephex at gephex.org--2004
Creator: The Gephex Source Archive <gephex at gephex.org>
Date: Fri Apr  1 23:41:14 CEST 2005
Standard-date: 2005-04-01 21:41:14 GMT
Modified-files: types/src/osctype/osctype.h
New-patches: gephex at gephex.org--2004/gephex--main--0.4--patch-1870
    martin at gephex.org--2004/gephex--osc--0.4--patch-5
Summary: [MERGE-REQUEST] bugfix #113
Keywords: 

Patches applied:

 * martin at gephex.org--2004/gephex--osc--0.4--patch-5
   removes a copy of the already fixed midi bug (#112) 

* added files

    {arch}/gephex/gephex--main/gephex--main--0.4/gephex at gephex.org--2004/patch-log/patch-1870
    {arch}/gephex/gephex--osc/gephex--osc--0.4/martin at gephex.org--2004/patch-log/patch-5

* modified files

--- orig/types/src/osctype/osctype.h
+++ mod/types/src/osctype/osctype.h
@@ -1,6 +1,6 @@
 /* This source file is a part of the GePhex Project.
 
- Copyright (C) 2001-2004
+ Copyright (C) 2001-2005
 
  Georg Seidel <georg at gephex.org> 
  Martin Bayer <martin at gephex.org> 
@@ -62,7 +62,7 @@
 {
   assert( osc_invariant(dst) );
   unsigned char* newData;
-
+  
   if (newSize < dst->len)
     return;
 
@@ -83,11 +83,8 @@
 				     int len)
 {
   assert( osc_invariant(dst) );
-  if (len == 0)
-    return;
 
-  if (dst->capacity < len)
-    osc_resize(dst, len);
+  osc_resize(dst, len);
 
   assert(dst->capacity >= len);
   assert(dst->data != 0);
@@ -102,11 +99,7 @@
   assert( osc_invariant(dst) );
   assert( osc_invariant(src) );
   
-  if (src->len == 0)
-    return;
-
-  if (dst->capacity < src->len)
-    osc_resize(dst, src->len);
+  osc_resize(dst, src->len);
   
   assert(dst->capacity >= src->len);
   assert(dst->data != 0);