Changeset f8700888 in tol

Timestamp:

Feb 18, 2013, 2:31:01 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3b53793

Parents:

ec868ac

Message:

Allows BZIP2

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@5621 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/OIS/oisapitol.cpp (modified) (1 diff)

tol/OIS/oisapitol.cpp

@@ -455 +455 @@
               { 
                 options_.compressor_.serialization_.engine_ = SerialEngine(Text(serialization[n]));
-                if(options_.compressor_.serialization_.engine_!=BSE_BZIP2_)
+                if(options_.compressor_.serialization_.engine_==BSE_NONE_)
                 {
+                  options_.compressor_.serialization_.engine_=BOis::BSE_NONE_;
+                }
+                else if(options_.compressor_.serialization_.engine_==BSE_BZIP2_)
+                {
+                  options_.compressor_.serialization_.engine_=BOis::BSE_BZIP2_;
                 }
                 else
                 {
                   options_.compressor_.serialization_.engine_=BOis::BSE_BZIP2_;
-                  Warning(I2("OIS: Argument options->compression->serialization->engine of Ois.Create function must be \"_BZIP2_\"",
-                             "OIS: El options->compression->serialization->engine de la función Ois.Create ha de ser \"_BZIP2_\""));
+                  Warning(I2("OIS: Argument options->compression->serialization->engine of Ois.Create function must be \"_BZIP2_\" or \"_NONE_\"",
+                             "OIS: El options->compression->serialization->engine de la función Ois.Create ha de ser \"_BZIP2_\" o \"_NONE_\""));
                 }
               }