dd168a35c5
The general idea is to keep the 'old', C-style MEM_callocN signature, and slowly replace most of its usages with the new, C++-style type-safer template version. * `MEM_cnew<T>` allocation version is renamed to `MEM_callocN<T>`. * `MEM_cnew_array<T>` allocation version is renamed to `MEM_calloc_arrayN<T>`. * `MEM_cnew<T>` duplicate version is renamed to `MEM_dupallocN<T>`. Similar templates type-safe version of `MEM_mallocN` will be added soon as well. Following discussions in !134452. NOTE: For now static type checking in `MEM_callocN` and related are slightly different for Windows MSVC. This compiler seems to consider structs using the `DNA_DEFINE_CXX_METHODS` macro as non-trivial (likely because their default copy constructors are deleted). So using checks on trivially constructible/destructible instead on this compiler/system. Pull Request: https://projects.blender.org/blender/blender/pulls/134771
66 lines
1.4 KiB
C++
66 lines
1.4 KiB
C++
/* SPDX-FileCopyrightText: 2004-2021 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup bli
|
|
*/
|
|
|
|
#ifndef WIN32
|
|
# include <unistd.h> /* for read close */
|
|
#else
|
|
# include "BLI_winstuff.h"
|
|
# include "winsock2.h"
|
|
# include <io.h> /* for open close read */
|
|
#endif
|
|
|
|
#include "BLI_fileops.h"
|
|
#include "BLI_filereader.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
struct RawFileReader {
|
|
FileReader reader;
|
|
|
|
int filedes;
|
|
};
|
|
|
|
static int64_t file_read(FileReader *reader, void *buffer, size_t size)
|
|
{
|
|
RawFileReader *rawfile = (RawFileReader *)reader;
|
|
int64_t readsize = BLI_read(rawfile->filedes, buffer, size);
|
|
|
|
if (readsize >= 0) {
|
|
rawfile->reader.offset += readsize;
|
|
}
|
|
|
|
return readsize;
|
|
}
|
|
|
|
static off64_t file_seek(FileReader *reader, off64_t offset, int whence)
|
|
{
|
|
RawFileReader *rawfile = (RawFileReader *)reader;
|
|
rawfile->reader.offset = BLI_lseek(rawfile->filedes, offset, whence);
|
|
return rawfile->reader.offset;
|
|
}
|
|
|
|
static void file_close(FileReader *reader)
|
|
{
|
|
RawFileReader *rawfile = (RawFileReader *)reader;
|
|
close(rawfile->filedes);
|
|
MEM_freeN(rawfile);
|
|
}
|
|
|
|
FileReader *BLI_filereader_new_file(int filedes)
|
|
{
|
|
RawFileReader *rawfile = MEM_callocN<RawFileReader>(__func__);
|
|
|
|
rawfile->filedes = filedes;
|
|
|
|
rawfile->reader.read = file_read;
|
|
rawfile->reader.seek = file_seek;
|
|
rawfile->reader.close = file_close;
|
|
|
|
return (FileReader *)rawfile;
|
|
}
|