diff options
Diffstat (limited to 'linden/indra/newview/moviemaker.cpp')
-rw-r--r-- | linden/indra/newview/moviemaker.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linden/indra/newview/moviemaker.cpp b/linden/indra/newview/moviemaker.cpp index 6a7da3f..34e5a16 100644 --- a/linden/indra/newview/moviemaker.cpp +++ b/linden/indra/newview/moviemaker.cpp | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <stdio.h> | 36 | #include <stdio.h> |
37 | #include <stdlib.h> | 37 | #include <stdlib.h> |
38 | #include <memory.h> | 38 | #include <memory.h> |
39 | #include "llmemtype.h" | ||
39 | 40 | ||
40 | #if LL_WINDOWS | 41 | #if LL_WINDOWS |
41 | 42 | ||
@@ -515,8 +516,9 @@ OSStatus MovieMaker::setupMovie() | |||
515 | 516 | ||
516 | rowBytes = width * 4; | 517 | rowBytes = width * 4; |
517 | bufferSize = height * rowBytes; | 518 | bufferSize = height * rowBytes; |
518 | buffer = (char*)malloc(bufferSize); | 519 | LLMemType mt(LLMemType::MTYPE_SCRIPT); |
519 | invertedBuffer = (char*)malloc(bufferSize); | 520 | buffer = (char*) new char(bufferSize); |
521 | invertedBuffer = (char*) new char(bufferSize); | ||
520 | 522 | ||
521 | rect.left = 0; | 523 | rect.left = 0; |
522 | rect.top = 0; | 524 | rect.top = 0; |
@@ -684,13 +686,13 @@ void MovieMaker::EndCapture() | |||
684 | 686 | ||
685 | if(buffer) | 687 | if(buffer) |
686 | { | 688 | { |
687 | free(buffer); | 689 | delete(buffer); |
688 | buffer = NULL; | 690 | buffer = NULL; |
689 | } | 691 | } |
690 | 692 | ||
691 | if(invertedBuffer) | 693 | if(invertedBuffer) |
692 | { | 694 | { |
693 | free(invertedBuffer); | 695 | delete(invertedBuffer); |
694 | invertedBuffer = NULL; | 696 | invertedBuffer = NULL; |
695 | } | 697 | } |
696 | } | 698 | } |