X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Frecode.c;h=c9787b11bdfeaf3094b1650a76daa50dabedb76e;hb=38993354cabb6fc37bb882be92f9a49e9aeb4c88;hp=7f45865739ce4691cba7fa984a5b64a933267740;hpb=00129e248ab4ce96af72d380d8a0ccfad2f5d776;p=pspp

diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c
index 7f45865739..c9787b11bd 100644
--- a/src/language/xforms/recode.c
+++ b/src/language/xforms/recode.c
@@ -159,6 +159,7 @@ cmd_recode (struct lexer *lexer, struct dataset *ds)
       /* Create destination variables, if needed.
          This must be the final step; otherwise we'd have to
          delete destination variables on failure. */
+      trns->dst_dict = dataset_dict (ds);
       if (trns->src_vars != trns->dst_vars)
 	create_dst_vars (trns, dataset_dict (ds));
 
@@ -545,8 +546,6 @@ create_dst_vars (struct recode_trns *trns, struct dictionary *dict)
 {
   size_t i;
 
-  trns->dst_dict = dict;
-
   for (i = 0; i < trns->var_cnt; i++)
     {
       const struct variable **var = &trns->dst_vars[i];
@@ -608,8 +607,9 @@ static const struct map_out *
 find_src_string (struct recode_trns *trns, const uint8_t *value,
                  const struct variable *src_var)
 {
-  struct mapping *m;
+  const char *encoding = dict_get_encoding (trns->dst_dict);
   int width = var_get_width (src_var);
+  struct mapping *m;
 
   for (m = trns->mappings; m < trns->mappings + trns->map_cnt; m++)
     {
@@ -632,8 +632,7 @@ find_src_string (struct recode_trns *trns, const uint8_t *value,
 
             msg_disable ();
             match = data_in (ss_buffer (CHAR_CAST_BUG (char *, value), width),
-                             LEGACY_NATIVE, FMT_F, 0, 0, trns->dst_dict,
-                             &uv, 0);
+                             LEGACY_NATIVE, FMT_F, 0, 0, &uv, 0, encoding);
             msg_enable ();
             out->value.f = uv.f;
             break;