kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #34626: voxel data texture can't read > 2GB files on Windows.

Browse Source 
Also fixed BLI_fopen not being used for AVI movie files, which meant AVI read
could fail reading a file from a path with special characters on Windows.
This commit is contained in:
Brecht Van Lommel 2013-03-13 17:16:47 +00:00
parent 80de3192a7
commit a3ad35cf3a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/avi/intern/avi.c
View File

@ -41,9 +41,7 @@
#include "MEM_guardedalloc.h"
#include "MEM_sys_types.h"
#ifdef WIN32
# include "BLI_winstuff.h"
#endif
#include "BLI_fileops.h"
#include "AVI_avi.h"
#include "avi_intern.h"
@ -208,7 +206,7 @@ int AVI_is_avi(char *name)
FILE *fp;
int ret;
fp = fopen(name, "rb");
fp = BLI_fopen(name, "rb");
if (fp == NULL)
return 0;
@ -238,7 +236,7 @@ int AVI_is_avi(const char *name)
DEBUG_PRINT("opening movie\n");
movie.type = AVI_MOVIE_READ;
movie.fp = fopen(name, "rb");
movie.fp = BLI_fopen(name, "rb");
movie.offset_table = NULL;
if (movie.fp == NULL)
@ -441,7 +439,7 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
memset(movie, 0, sizeof(AviMovie));
movie->type = AVI_MOVIE_READ;
movie->fp = fopen(name, "rb");
movie->fp = BLI_fopen(name, "rb");
movie->offset_table = NULL;
if (movie->fp == NULL)
@ -765,7 +763,7 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...)
int64_t junk_pos;
movie->type = AVI_MOVIE_WRITE;
movie->fp = fopen(name, "wb");
movie->fp = BLI_fopen(name, "wb");
movie->index_entries = 0;

8
source/blender/blenlib/BLI_fileops.h
View File

@ -33,6 +33,14 @@
#ifndef __BLI_FILEOPS_H__
#define __BLI_FILEOPS_H__
/* for 64 bit fseek, ftell, .. */
#ifdef WIN32
#include "BLI_winstuff.h"
#endif
/* for bool */
#include "BLI_utildefines.h"
#include <stdio.h>
#include <sys/stat.h>