[Bf-blender-cvs] [40ecb2ded81] master: Windows: use int64_t instead of off_t
Campbell Barton
noreply at git.blender.org
Tue Mar 19 10:30:30 CET 2019
Commit: 40ecb2ded81ba7265c426f6680faf3417ff22aeb
Author: Campbell Barton
Date: Tue Mar 19 20:28:05 2019 +1100
Branches: master
https://developer.blender.org/rB40ecb2ded81ba7265c426f6680faf3417ff22aeb
Windows: use int64_t instead of off_t
Avoids 2gb file size limit.
===================================================================
M source/blender/blenkernel/intern/bpath.c
M source/blender/imbuf/intern/jp2.c
===================================================================
diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c
index e85cb700bce..3d91283e1cc 100644
--- a/source/blender/blenkernel/intern/bpath.c
+++ b/source/blender/blenkernel/intern/bpath.c
@@ -211,7 +211,7 @@ static bool missing_files_find__recursive(
char *filename_new,
const char *dirname,
const char *filename,
- off_t *r_filesize,
+ int64_t *r_filesize,
int *r_recur_depth)
{
/* file searching stuff */
@@ -219,7 +219,7 @@ static bool missing_files_find__recursive(
struct dirent *de;
BLI_stat_t status;
char path[FILE_MAX];
- off_t size;
+ int64_t size;
bool found = false;
dir = opendir(dirname);
@@ -275,7 +275,7 @@ static bool missing_files_find__visit_cb(void *userdata, char *path_dst, const c
BPathFind_Data *data = (BPathFind_Data *)userdata;
char filename_new[FILE_MAX];
- off_t filesize = -1;
+ int64_t filesize = -1;
int recur_depth = 0;
bool found;
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index c3690bcf643..aaeb4e4c2ad 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -138,7 +138,7 @@ static void info_callback(const char *msg, void *client_data)
struct BufInfo {
const unsigned char *buf;
const unsigned char *cur;
- off_t len;
+ OPJ_OFF_T len;
};
static void opj_read_from_buffer_free(void *UNUSED(p_user_data))
More information about the Bf-blender-cvs
mailing list