← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ifrit/saucy

« back to all changes in this revision

Viewing changes to debian/patches/01_no_patented.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Mark Hymers
  • Date: 2007-12-22 17:51:09 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071222175109-jzymwfipyu1fl6jz
Tags: 3.2.2-2
* The "Running lintian on the right file considered helpful" release.
* Move Homepage to source stanza
* Use Applications/Science/Data Analysis as the menu section 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_no_patented.dpatch
8
8
 
9
9
@DPATCH@
10
10
 
11
 
--- ifrit-orig/core/iwriter.cpp (revision 203)
 
11
--- ifrit-orig/core/iwriter.cpp (revision 261)
12
12
+++ ifrit/core/iwriter.cpp      (working copy)
13
 
@@ -49,8 +49,10 @@
14
 
 #ifdef IVTK_SUPPORTS_AVI
 
13
@@ -52,9 +52,11 @@
15
14
 #include <vtkAVIWriter.h>
16
15
 #endif
 
16
 
17
17
+#if 0
 
18
 #ifdef IVTK_SUPPORTS_MPEG
18
19
 #include <vtkMPEG2Writer.h>
19
20
 #endif
20
21
+#endif
21
22
 
22
 
 //
23
 
 //  Templates
24
 
@@ -91,7 +93,7 @@
 
23
 #else
 
24
 
 
25
@@ -101,7 +103,7 @@
25
26
 
26
27
        void Finish()
27
28
        {
30
31
                int i;
31
32
 
32
33
                for(i=0; i<mImageWriters.Size(); i++) if(mImageWriters[i]->GetInput() != 0)
33
 
@@ -117,7 +119,7 @@
 
34
@@ -127,7 +129,7 @@
34
35
 
35
36
        virtual ~iGenericMultiImageMovieWriter()
36
37
        {
39
40
                while(mImageWriters.Size() > 0) mImageWriters.RemoveLast()->Delete();
40
41
 #endif
41
42
        }
42
 
@@ -204,7 +206,7 @@
 
43
@@ -214,7 +216,7 @@
43
44
 {
44
45
        if(mStarted)
45
46
        {
48
49
                while(2*images.Size() < mImageWriters.Size()) mImageWriters.RemoveLast()->Delete();
49
50
                while(2*images.Size() > mImageWriters.Size())
50
51
                {
51
 
@@ -241,7 +243,7 @@
 
52
@@ -251,7 +253,7 @@
52
53
                mStarted = false;
53
54
        }
54
55
 
57
58
        if(!mStarted && 2*images.Size()!=mImageWriters.Size())
58
59
        {
59
60
                IERROR_LOW("Unable to write a movie file: different frames have varied number of images.");
60
 
@@ -362,9 +364,8 @@
 
61
@@ -372,9 +374,8 @@
61
62
 {
62
63
        if(i>=0 && i<__NumAnimationOutputs && i!=mAnimationOutput)
63
64
        {