remove reference to obsolete Makefile.vc

[platform/upstream/flac.git] / src / libFLAC / memory.c

diff --git a/src/libFLAC/memory.c b/src/libFLAC/memory.c
index 9215104..cb6fa8a 100644 (file)
--- a/src/libFLAC/memory.c
+++ b/src/libFLAC/memory.c
@@ -1,5 +1,5 @@
 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2001  Josh Coalson
+ * Copyright (C) 2001,2002,2003  Josh Coalson
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,6 +20,10 @@
 #include "private/memory.h"
 #include "FLAC/assert.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
 {
        void *x;
@@ -37,16 +41,38 @@ void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
        return x;
 }
 
-bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, int32 **unaligned_pointer, int32 **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 **unaligned_pointer, FLAC__int32 **aligned_pointer)
+{
+       FLAC__int32 *pa, *pu; /* aligned pointer, unaligned pointer */
+
+       FLAC__ASSERT(elements > 0);
+       FLAC__ASSERT(0 != unaligned_pointer);
+       FLAC__ASSERT(0 != aligned_pointer);
+       FLAC__ASSERT(unaligned_pointer != aligned_pointer);
+
+       pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(FLAC__int32) * elements, (void**)&pa);
+       if(0 == pu) {
+               return false;
+       }
+       else {
+               if(*unaligned_pointer != 0)
+                       free(*unaligned_pointer);
+               *unaligned_pointer = pu;
+               *aligned_pointer = pa;
+               return true;
+       }
+}
+
+FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint32 **unaligned_pointer, FLAC__uint32 **aligned_pointer)
 {
-       int32 *pa, *pu; /* aligned pointer, unaligned pointer */
+       FLAC__uint32 *pa, *pu; /* aligned pointer, unaligned pointer */
 
        FLAC__ASSERT(elements > 0);
        FLAC__ASSERT(0 != unaligned_pointer);
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       pu = (int32*)FLAC__memory_alloc_aligned(sizeof(int32) * elements, (void*)&pa);
+       pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint32) * elements, (void**)&pa);
        if(0 == pu) {
                return false;
        }
@@ -59,16 +85,16 @@ bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, int32 **unaligned
        }
 }
 
-bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, uint32 **unaligned_pointer, uint32 **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint64 **unaligned_pointer, FLAC__uint64 **aligned_pointer)
 {
-       uint32 *pa, *pu; /* aligned pointer, unaligned pointer */
+       FLAC__uint64 *pa, *pu; /* aligned pointer, unaligned pointer */
 
        FLAC__ASSERT(elements > 0);
        FLAC__ASSERT(0 != unaligned_pointer);
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       pu = (uint32*)FLAC__memory_alloc_aligned(sizeof(uint32) * elements, (void*)&pa);
+       pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint64) * elements, (void**)&pa);
        if(0 == pu) {
                return false;
        }
@@ -81,7 +107,7 @@ bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, uint32 **unalign
        }
 }
 
-bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **unaligned_pointer, unsigned **aligned_pointer)
 {
        unsigned *pa, *pu; /* aligned pointer, unaligned pointer */
 
@@ -90,7 +116,7 @@ bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **una
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, (void*)&pa);
+       pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, (void**)&pa);
        if(0 == pu) {
                return false;
        }
@@ -103,16 +129,16 @@ bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned **una
        }
 }
 
-bool FLAC__memory_alloc_aligned_real_array(unsigned elements, real **unaligned_pointer, real **aligned_pointer)
+FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real **unaligned_pointer, FLAC__real **aligned_pointer)
 {
-       real *pa, *pu; /* aligned pointer, unaligned pointer */
+       FLAC__real *pa, *pu; /* aligned pointer, unaligned pointer */
 
        FLAC__ASSERT(elements > 0);
        FLAC__ASSERT(0 != unaligned_pointer);
        FLAC__ASSERT(0 != aligned_pointer);
        FLAC__ASSERT(unaligned_pointer != aligned_pointer);
 
-       pu = (real*)FLAC__memory_alloc_aligned(sizeof(real) * elements, (void*)&pa);
+       pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(FLAC__real) * elements, (void**)&pa);
        if(0 == pu) {
                return false;
        }