Made the preset numbering more logical in liblzma API.

3 files changed, 13 insertions, 12 deletions

diff --git a/src/liblzma/api/lzma/container.h b/src/liblzma/api/lzma/container.h
index 256bbc69..ff640a6c 100644
--- a/src/liblzma/api/lzma/container.h
+++ b/src/liblzma/api/lzma/container.h
@@ -49,7 +49,7 @@ typedef enum {
 		/**<
 		 * LZMA2 filter with fast compression (fast in terms of LZMA2).
 		 * If you are interested in the exact options used, see
-		 * lzma_preset_lzma[0]. Note that the exact options may
+		 * lzma_lzma_preset(1). Note that the exact options may
 		 * change between liblzma versions.
 		 *
 		 * At the moment, the command line tool uses these settings
@@ -57,18 +57,18 @@ typedef enum {
 		 * may default to some more complex way to determine the
 		 * settings used e.g. the type of files being compressed.
 		 *
-		 * LZMA_EASY_LZMA_2 is equivalent to lzma_preset_lzma[1]
+		 * LZMA_EASY_LZMA2_2 is equivalent to lzma_lzma_preset(2)
 		 * and so on.
 		 */
 
-	LZMA_EASY_LZMA_2    = 2,
-	LZMA_EASY_LZMA_3    = 3,
-	LZMA_EASY_LZMA_4    = 4,
-	LZMA_EASY_LZMA_5    = 5,
-	LZMA_EASY_LZMA_6    = 6,
-	LZMA_EASY_LZMA_7    = 7,
-	LZMA_EASY_LZMA_8    = 8,
-	LZMA_EASY_LZMA_9    = 9,
+	LZMA_EASY_LZMA2_2    = 2,
+	LZMA_EASY_LZMA2_3    = 3,
+	LZMA_EASY_LZMA2_4    = 4,
+	LZMA_EASY_LZMA2_5    = 5,
+	LZMA_EASY_LZMA2_6    = 6,
+	LZMA_EASY_LZMA2_7    = 7,
+	LZMA_EASY_LZMA2_8    = 8,
+	LZMA_EASY_LZMA2_9    = 9,
 } lzma_easy_level;
 
 
diff --git a/src/liblzma/api/lzma/lzma.h b/src/liblzma/api/lzma/lzma.h
index 094667eb..5ec563dd 100644
--- a/src/liblzma/api/lzma/lzma.h
+++ b/src/liblzma/api/lzma/lzma.h
@@ -394,7 +394,7 @@ typedef struct {
 /**
  * \brief       Set a compression level preset to lzma_options_lzma structure
  *
- * level = 0 is the fastest and level = 8 is the slowest. These presets match
+ * level = 1 is the fastest and level = 9 is the slowest. These presets match
  * the switches -1 .. -9 of the command line tool.
  *
  * The preset values are subject to changes between liblzma versions.
diff --git a/src/liblzma/lzma/lzma_encoder_presets.c b/src/liblzma/lzma/lzma_encoder_presets.c
index 7ef3509e..b48e0698 100644
--- a/src/liblzma/lzma/lzma_encoder_presets.c
+++ b/src/liblzma/lzma/lzma_encoder_presets.c
@@ -53,9 +53,10 @@ lzma_lzma_preset(lzma_options_lzma *options, uint32_t level)
 extern LZMA_API lzma_bool
 lzma_lzma_preset(lzma_options_lzma *options, uint32_t level)
 {
-	if (level >= 9)
+	if (level == 0 || level > 9)
 		return true;
 
+	--level;
 	memzero(options, sizeof(*options));
 
 	static const uint8_t shift[9] = { 16, 20, 19, 20, 21, 22, 23, 24, 25 };