From 1a69bdd87ea9aaee1905050364409c90fe5dd533 Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka <shinya_kitaoka@dwango.co.jp> Date: Jun 23 2016 07:34:05 +0000 Subject: fix ino_line_blur --- diff --git a/toonz/sources/stdfx/ino_line_blur.cpp b/toonz/sources/stdfx/ino_line_blur.cpp index f83362f..057884e 100644 --- a/toonz/sources/stdfx/ino_line_blur.cpp +++ b/toonz/sources/stdfx/ino_line_blur.cpp @@ -67,29 +67,25 @@ IGS_LINE_BLUR_EXPORT void convert( //===================== -#include <windows.h> -#include <stdio.h> -#include <math.h> -#include <stdint.h> -#include <string.h> -#include <stdarg.h> -#include <time.h> +#include <cstdio> +#include <cmath> +#include <cstdint> +#include <cstring> +#include <cstdarg> +#include <ctime> #include <assert.h> -#include <stdlib.h> +#include <cstdlib> + #include <iostream> #include <stdexcept> + +#include <windows.h> + namespace { #ifndef _pri_h_ #define _pri_h_ -/* Windowsではstdint.hが見付からない */ -#if defined _WIN32 -typedef int int32_t; -#else -#include <stdint.h> /* for int32_t */ -#endif - #ifdef __cplusplus extern "C" { #endif @@ -5238,15 +5234,15 @@ int thinnest_ui16_image::exec05_thin(void) { /* メモリ開放 */ void thinnest_ui16_image::mem_free(void) { #if 0 - if (NULL != this->_ui16p_channel[0]) { - if (ON == this->_i_mv_sw) { - pri_funct_msg_ttvr( "thinnest_ui16_image::mem_free()" ); - } - - free( this->_ui16p_channel[0]);/* ここで落ちる2014-5-16 */ - this->_ui16p_channel[0] = NULL; - this->_ui16p_channel[1] = NULL; - } + if (NULL != this->_ui16p_channel[0]) { + if (ON == this->_i_mv_sw) { + pri_funct_msg_ttvr( "thinnest_ui16_image::mem_free()" ); + } + + free( this->_ui16p_channel[0]);/* ここで落ちる2014-5-16 */ + this->_ui16p_channel[0] = NULL; + this->_ui16p_channel[1] = NULL; + } #endif if (NULL != this->memory_free_this_) { if (ON == this->_i_mv_sw) {